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
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -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
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
ZappoMan
05a4a6aa9b
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
2015-08-01 13:07:56 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123
Added the & references to the const variables
2015-07-30 15:08:02 +02:00
Howard Stearns
ebd0e38d49
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:54:40 -07:00
Seth Alves
b7ecffa0be
treat a "g" in an obj file the same as a "o"
2015-07-29 17:55:56 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Seth Alves
f4a23065b4
if obj data isn't from a url, don't dereference null url pointer
2015-07-27 19:06:14 -07:00
Andrew Meadows
c7f367bfd7
removing unnecessary #include <Shape.h>
2015-07-27 15:30:37 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Marcel Verhagen
d25e09af74
removed the last 2 filename lines, they should not be there.
2015-07-26 00:48:31 +02:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Marcel Verhagen
8f0893ba21
Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
...
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.
So it now does not break existing content.
Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Howard Stearns
3cd1e318b2
Fix https://app.asana.com/0/32622044445063/39927009585710
2015-07-14 13:15:24 -07:00
Marcel Verhagen
fac497dadc
Removed the file where the directory is stripped off the RelativeFilename, and replace \ with /.
...
However this introduces a new problem with the current fbx files who do not have their textures in the original dir but moved it to the dir where the fbx file lives.
Suppose there should be some logic when the texture is not found to look if the texture lives in the dir above the RelativeFilename.
In any case it is not obvious when there is a texture missing on a model, it simply renders black.
2015-07-14 15:31:56 +02:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Sam Gateau
b0f5990bd7
fix syntax
2015-06-19 17:13:29 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
ZappoMan
aa05d9f67c
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-10 08:53:33 -07:00
ZappoMan
ba0cecb356
remove attachments from Model - only supported at avatar layer
2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7
first take on the materialKey
2015-06-09 12:17:10 -07:00
Seth Alves
1e2e4001b1
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 10:24:02 -07:00
Seth Alves
0db5ddc5b7
port code from samcake's model branch
2015-05-13 15:43:16 -07:00
Howard Stearns
c0a71da9e3
Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting ( http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj ).
2015-05-09 13:16:34 -07:00
Howard Stearns
8db8e56af0
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 16:41:52 -07:00
Howard Stearns
aad4c06244
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 12:03:56 -07:00
Howard Stearns
9acdb3fb28
Proper defaults for material properties and a fail-safe for missing uv coordinates.
2015-05-07 10:47:50 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Howard Stearns
35337ef2c2
Spell out order-of-evaluation for the compiler.
2015-05-06 12:28:45 -07:00
Howard Stearns
d2dbb2c116
Missing the code!
2015-05-06 11:57:34 -07:00
