Marcel Verhagen
fa6d6a5123
Added the & references to the const variables
2015-07-30 15:08:02 +02:00
Marcel Verhagen
d25e09af74
removed the last 2 filename lines, they should not be there.
2015-07-26 00:48:31 +02: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
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
Andrew Meadows
a24fd13665
Merge pull request #5312 from sethalves/fix-hold-action-deserialize
...
fix hold-action deserialization.
2015-07-13 11:33:16 -07:00
Brad Hefta-Gaub
db8d8a34bf
Merge pull request #5310 from sethalves/improve-voxel.js
...
allow voxels.js to work on an empty voxel-space
2015-07-13 07:17:12 -07:00
Seth Alves
848e5bcebf
this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit
2015-07-12 13:43:21 -07:00
Seth Alves
fb23eb0faf
Merge pull request #5301 from samcake/yellow
...
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
87152a4de2
Merge pull request #5302 from AndrewMeadows/astatine
...
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Seth Alves
c56b2918a4
allow voxels.js to work on an empty voxel-space
2015-07-12 10:35:44 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Philip Rosedale
2480402515
Merge pull request #5305 from howard-stearns/sword-update
...
Functional sword script
2015-07-10 17:05:24 -07:00
Brad Hefta-Gaub
2439e4faab
Merge pull request #5304 from jherico/homer
...
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 17:04:50 -07:00
Brad Davis
eb9d52fbb3
Helps to actually commit the fix
2015-07-10 16:11:56 -07:00
Brad Davis
c1b72db18d
Still trying to get jenkins builds to work
2015-07-10 16:00:51 -07:00
Howard Stearns
c340d336dc
Functional sword script:
...
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
2015-07-10 15:43:56 -07:00
Brad Davis
3db3676fae
Fixing compile failure
2015-07-10 15:26:22 -07:00
Sam Gateau
98f10e72ec
fix the wrong function name that happened missing a merge
2015-07-10 15:20:49 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d
Merge pull request #5303 from ZappoMan/animationGlitch
...
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162
fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change
2015-07-10 12:43:35 -07:00
Andrew Meadows
9cb7e86877
cleanup of AvatarActionHold deserialization
2015-07-10 12:34:12 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5
add checks for NaN
2015-07-10 12:25:11 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
samcake
09ea9b751f
Merge pull request #5300 from hyperlogic/ajt/transform-unit-test
...
Added unit test for shared/transform.
2015-07-10 11:35:13 -07:00
Niraj Venkat
2e5fd04d9e
Fix to get build working on Linux
2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Andrew Meadows
1759f0553d
Merge pull request #5290 from BingShearer/CrashFixes
...
Crash fixes
2015-07-10 10:42:47 -07:00
Brad Hefta-Gaub
89231adc19
Merge pull request #5299 from jherico/homer
...
Performance optimizations in transform buffers and geometry cache
2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
33016e2797
Merge pull request #5293 from jherico/bart
...
More profiling ranges and updated performance testing scripts
2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub
af20969eb9
Merge pull request #5298 from jherico/lisa
...
Restore audio scope
2015-07-09 19:03:29 -07:00
Brad Hefta-Gaub
74ef91550c
Merge pull request #5296 from venkatn93/master
...
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 18:54:06 -07:00
Anthony J. Thibault
474a643611
Added unit test for shared/transform.
...
The getInverseMat is currently failing, it shows the issue that was affecting the
mirror rendering.
2015-07-09 18:53:12 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
Brad Davis
cf7f3336d0
Merge pull request #5297 from samcake/daft
...
Remove unecessary dependencies in DeferredLightingEffect
2015-07-09 17:51:26 -07:00
Brad Davis
a92a7980d7
Restore audio scope
2015-07-09 17:49:25 -07:00
Andrew Meadows
270ea7af9e
Merge pull request #5292 from sethalves/palm-rotation
...
action changes to allow "hold" action to track palm rotation
2015-07-09 17:44:28 -07:00
Niraj Venkat
007d662db1
Re-added for shouldRenderEntities
2015-07-09 17:40:14 -07:00
Sam Gateau
11f2d74030
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
2015-07-09 17:33:25 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Seth Alves
bf6fce4e45
remove unneeded const
2015-07-09 17:05:15 -07:00
Seth Alves
d0d0b2a143
Merge pull request #5295 from birarda/master
...
potential fix for windows domain connect cycling
2015-07-09 17:04:06 -07:00
Niraj Venkat
bd91daf712
Removing debug code
2015-07-09 16:27:23 -07:00
Niraj Venkat
adf5b95835
Changing formatting
2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d
Fixing merge
2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -07:00
