Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 23:28:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11865 commits 25 branches 0 tags 1.1 GiB
Commit graph

157 commits

Author SHA1 Message Date
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Andrzej Kapolka
c5ffe54a91 Working on loading animation data. 2014-04-14 16:26:30 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrew Meadows
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model 
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
 2014-04-01 09:25:25 -07:00
Stephen Birarda
7b840f760c Merge pull request #2538 from AndrewMeadows/enforce-standard 
making some type casts abide by coding standard
 2014-03-28 09:19:16 -07:00
Andrzej Kapolka
eab4b4bc5d Make sure we process the model root nodes in alphabetic order. 2014-03-27 14:47:46 -07:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrzej Kapolka
0fc0d50bda Only post the blender if we have blendable meshes to blend. 2014-03-18 17:19:42 -07:00
Andrzej Kapolka
299dbb93ea Removed "springiness" bits. 2014-03-18 13:57:36 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
44374732fa Further joint bits. 2014-03-06 19:30:24 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Andrew Meadows
2bc8e142b4 cruft removal 2014-03-05 11:51:42 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
Andrew Meadows
4ef2067421 Use capsules for some joints and render them. 2014-03-03 17:49:24 -08:00
Andrew Meadows
1c0826d696 Add JointShapeInfo for joint shape calculations 2014-03-03 12:31:09 -08:00
Andrzej Kapolka
c1a89517a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-28 18:11:46 -08:00
Andrew Meadows
4d984b1054 cleanup 2014-02-28 16:55:16 -08:00
Andrew Meadows
702612506b very basic bounding info for joint meshes 2014-02-28 16:42:12 -08:00
Andrzej Kapolka
2f27d8ecd3 Process geometry/textures in worker threads (via QThreadPool). Closes #2137. 2014-02-28 16:14:02 -08:00
Andrzej Kapolka
3fefec5545 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-26 16:29:31 -08:00
Andrzej Kapolka
f335bb8171 Preserve joint states when switching between LODs. Closes #2077. 2014-02-26 13:40:09 -08:00
Andrzej Kapolka
718439014a Compute the mesh extents for geometry and use them to set the spanner bounds. 2014-02-24 17:28:11 -08:00
Andrew Meadows
85e05539ad Adding comment about bug as a reminder to fix. 2014-02-19 08:59:17 -08:00
Andrzej Kapolka
3b1b067418 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-11 16:03:41 -08:00
Andrzej Kapolka
e29d6210bb Merge pull request #1981 from AndrewMeadows/avatar-interaction 
Avatar body-body collisions
 2014-02-11 16:02:43 -08:00
Andrzej Kapolka
b6d77ec637 Switched from loading FBX and FST simultaneously to loading FST first, then 
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model.  Also fixed a bug with the fallback models (they were
invisible after second failure).
 2014-02-11 14:20:52 -08:00
Andrew Meadows
d0f9b78710 Adding avatar body-body collisions to prevent near-clipping. 2014-02-11 13:48:48 -08:00
Andrzej Kapolka
f9e9d62fe3 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-10 19:02:58 -08:00
Andrzej Kapolka
bbb8e2a45f Ignore the =1's that Faceshift appends to our custom data in the FST. 2014-02-10 17:41:57 -08:00
Andrew Meadows
4edc6cd88b Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 15:42:56 -08:00
Andrew Meadows
e2e02fc855 Removing bounding sphere measurement of hands -- not useful yet. 2014-02-10 14:04:32 -08:00
Andrzej Kapolka
9c3624d0d9 Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures, 
as well as materials, by polygon.  Closes #1844.
 2014-02-07 14:25:48 -08:00
Andrew Meadows
082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-06 14:37:19 -08:00
Andrew Meadows
64ca66a2b7 Making renderCollisionProxies() public and measuring bounding volumes of hands. 2014-02-06 14:09:08 -08:00
ZappoMan
2f14b265a8 make sure SVO files with version details are supported 2014-02-04 20:24:08 -08:00
Andrzej Kapolka
2b4876181a Different take on the transform fix. 2014-01-31 19:38:45 -08:00
Andrzej Kapolka
e1350f8e24 Trying out a transform tweak. 2014-01-31 19:00:24 -08:00
Andrzej Kapolka
ff2afca50e Special handling for blendshapes in Blender exports. They're under the model, 
like the geometry.
 2014-01-31 15:24:54 -08:00
Andrzej Kapolka
78d9b79805 Another fix for Blender exports. Closes #1762. 2014-01-30 13:24:30 -08:00
Andrzej Kapolka
181670f5d7 Fixes for parsing FBX text encoding. 2014-01-30 12:53:02 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00