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
Seiji Emery
4d9f45475e
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8
fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/
2015-08-24 13:13:24 -07:00
Seiji Emery
691cb48a08
Fixed to use standard shaders from render-utils
2015-08-24 11:26:56 -07:00
Seiji Emery
e601484b17
...
2015-08-21 17:24:34 -07:00
Seiji Emery
14a76525b1
script dependency...?
...
(GeometryCache -> AnimationCache -> networking, fbx, model, animation,
script... >.>)
2015-08-21 16:56:26 -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
Seiji Emery
6b5fb60fcf
Merge remote-tracking branch 'highfidelity/master' into gputest
2015-08-19 11:24:15 -07:00
Brad Davis
a61d9501c8
Add polyvox to shader tests and clean up test code
2015-08-17 02:04:23 -07:00
Brad Hefta-Gaub
f76c663bb5
Merge pull request #5558 from AndrewMeadows/chromium
...
coalesce scattered unit-test helper functions
2015-08-14 18:12:03 -07:00
Brad Hefta-Gaub
31a49a551a
Merge pull request #5556 from jherico/bart
...
QML framerate improvments
2015-08-14 11:11:14 -07:00
Andrew Meadows
f64ab8e6b0
add QCOMPARE_QUATS macro for easier tests
2015-08-12 17:52:54 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
Andrew Meadows
f4e77b8200
remove another dupe unit-test util
2015-08-12 14:15:49 -07:00
Andrew Meadows
6dfbf7f70a
coalesce scattered dupes of unit-test utilities
2015-08-12 14:13:28 -07:00
Andrew Meadows
cae77cfd76
move GLMTestUtils.h where all tests can find it
2015-08-12 13:51:40 -07:00
Andrew Meadows
ba5346aee7
move GlmTestUtils.h to GLMTestUtils.h
2015-08-12 13:37:59 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
b726769f15
Merge pull request #5402 from highfidelity/plugins
...
New plugins architecture
2015-08-11 11:11:27 -07:00
David Rowe
84feaeb703
Merge branch 'master' into 20639
2015-08-11 10:33:17 -07:00
Howard Stearns
295d655eec
Merge pull request #5545 from AndrewMeadows/chlorine
...
rotation constraints in preparation for inverse kinematics
2015-08-11 09:19:16 -07:00
Andrew Meadows
23c92662ee
relaxed error, more rigor for using fabsf()
2015-08-10 23:09:11 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
Andrew Meadows
75ab6a00aa
add unit tests for RotationConstraints
2015-08-10 14:48:46 -07:00
Andrew Meadows
f9a4b82edd
add swing-twist decomposition util with unit-tests
2015-08-10 14:47:15 -07:00
Andrew Meadows
4a8baafdd2
fix QCOMPARE_WITH_ABS_ERROR for floats
2015-08-10 14:45:57 -07:00
Andrew Meadows
6db47e773f
removing ShapeColliderTests.*
2015-08-10 14:35:36 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
Bradley Austin Davis
fb2c84484e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:26:43 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
Howard Stearns
145b730f80
Clean up instantiation.
2015-08-07 12:27:26 -07:00
Seiji Emery
dbf94d673b
Cleanup
2015-08-07 12:01:58 -07:00
ericrius1
d735c85806
moving polyLineEntity over to core profile
2015-08-07 11:41:55 -07:00
Howard Stearns
42cc34cd64
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
2015-08-06 16:54:09 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Seiji Emery
ba8a15b893
Added primitives (geometryCache)
2015-08-05 20:02:22 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Seiji Emery
5ca8d20251
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
...
Conflicts:
cmake/modules/Find3DConnexionClient.cmake
interface/external/connexionclient/readme.txt
interface/src/devices/3DConnexionClient.cpp
interface/src/devices/3DConnexionClient.h
2015-08-05 15:56:06 -07:00
Bradley Austin Davis
89cc2ccfa5
More merge comments
2015-08-05 13:53:19 -07:00
Seiji Emery
29dcdefd26
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
...
Conflicts:
cmake/modules/Find3DConnexionClient.cmake
interface/external/connexionclient/readme.txt
interface/src/devices/3DConnexionClient.cpp
interface/src/devices/3DConnexionClient.h
2015-08-05 12:45:00 -07:00
Seiji Emery
91bfd07cd4
use geometry cache
2015-08-05 12:35:52 -07:00
David Rowe
0c174e27c3
Merge branch 'master' into 20639
2015-08-04 18:36:53 -07:00
David Rowe
fae26d901c
Add menu option to render look-at targets
2015-08-04 18:34:56 -07:00
Seiji Emery
5ce84c15ae
updated shaders
2015-08-04 16:27:07 -07:00
