samcake
103e1c76b3
Member initialization respecting the standard
2015-09-29 09:26:29 -07:00
samcake
1e9c19d535
Clean the Material FBX code and how we use the factor components for diffuse and specular
2015-09-28 17:46:48 -07:00
samcake
2a487a79a3
Getting something done today
2015-09-28 17:24:31 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Seth Alves
27688fa55b
get obj models to be visible again. textures don't work
2015-09-23 14:46:57 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
ea141aae92
Merge pull request #5865 from jherico/bart
...
Instancing work, second pass
2015-09-21 16:51:08 -07:00
samcake
dfe17e5708
Fix issues from review
2015-09-21 16:12:17 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
samcake
6a714f405c
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
2015-09-21 00:53:48 -07:00
samcake
a41c20a1b7
Fixing buggy hash map look up and cleaning of name
2015-09-20 14:17:55 -07:00
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
74c92af8e0
Merge pull request #5741 from AndrewMeadows/brokenCapsules
...
fix for bad bounding capsules for avatars
2015-09-09 09:33:57 -07:00
Andrew Meadows
281e4f21fc
fix avatar bounding capsule calculations
2015-09-08 15:03:12 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Anthony J. Thibault
5882ec02d0
Merge branch 'master' into ajt/new-anim-system
2015-09-04 11:05:29 -07:00
Andrew Meadows
16dfc39f5f
fix collision shape of avatars
2015-09-03 18:22:35 -07:00
Anthony J. Thibault
de31b92fd5
Merge branch 'master' into ajt/new-anim-system
2015-09-02 17:53:56 -07:00
Anthony J. Thibault
99586f259c
Renamed bindTransformIsValid to bindTransformFoundInCluster
2015-09-02 13:44:34 -07:00
Andrew Meadows
4a7a384c65
avoid bad joints when computing bounding capsule
2015-09-01 14:12:14 -07:00
Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9
Cleanup
2015-08-28 16:38:07 -07:00
Sam Gateau
e2fce12713
Splitting the FBXREader.cpp file into sub files
2015-08-28 09:51:03 -07:00
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02
REfining th eTextureMap design but still with the issue of the lightmapped model
2015-08-27 09:52:07 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Seth Alves
f53704051f
ifdef out debug prints in OBJ reader
2015-08-26 15:09:58 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Anthony J. Thibault
5a73aef1f8
AnimSkeleton more accurate bind pose generation.
2015-08-24 16:19:16 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Seth Alves
1c8030472a
back out the more controversial changes
2015-08-17 12:40:56 -07:00
Seth Alves
d6322903a2
quiet compiler
2015-08-11 10:12:46 -07:00
Sam Gateau
561a058dc8
cleaning th ecode
2015-08-06 18:53:21 -07:00
Sam Gateau
f0f141a2b4
SImple fix to the case of multiple material in a mesh with different opacity
2015-08-06 18:51:44 -07:00
Anthony J. Thibault
da3d35cdfc
Added scaleOffset to FBXJoint::postTransform as it was missing.
...
Also added some documentation/comments to the FBXJoint struct.
2015-08-04 18:14:50 -07:00
Andrew Meadows
b00d47d62e
merge master into cleanup of legacy shapes
2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
