Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33045 commits 71 branches 56 tags 1.2 GiB
Commit graph

660 commits

Author SHA1 Message Date
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
Atlante45
dfaa16d15c Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-05 10:39:02 -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
Anthony J. Thibault
5d83976e2a Added AnimBlendLinear + tests. 
MyAvatar now does a sine wave blend between a walk
and a walk animation.
 2015-08-04 18:14:50 -07:00
Anthony J. Thibault
91ca13c66d Added AnimDebugDraw to render-utils 2015-08-04 18:14:46 -07:00
Anthony J. Thibault
f5dee717a1 Added fbx loading via animation cache. 
* added AnimPose::copyFromNetworkAnim() which
  should, re-map bone ids to match the current
  skeleton, and fill in missing bones with bind
  pose frames.
* added ability to set a skeleton on a node.
  I might need to add a recursive version of this.
* it compiles!
* tests run!
 2015-08-04 18:14:46 -07:00
Anthony J. Thibault
343b2ccf9d Added AnimNodeLoader which loads AnimClip nodes from json 
* added tests and sample json file
 2015-08-04 18:14:45 -07:00
Anthony J. Thibault
35196a0059 bare-bones AnimClip implementation with tests! 
It accumulates time and handles looping, and should handle
onDone and onLoop events in the future.
 2015-08-04 18:14:45 -07:00
Seiji Emery
5ce84c15ae updated shaders 2015-08-04 16:27:07 -07:00
Bradley Austin Davis
4f759ee46a Merge remote-tracking branch 'upstream/master' into core 2015-08-04 16:26:16 -07:00
Seiji Emery
e5cb9cb862 integrating core-profile work to get opengl 4.1 on mac 2015-08-04 15:18:47 -07:00
Seiji Emery
9caf440746 basic shader sort-of working (sip) 2015-08-04 12:53:23 -07:00
Stephen Birarda
52b1b647a2 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-08-04 10:51:23 -07:00
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Sam Gondelman
d182199c71 adding the rest of the shaders to shaders-test 2015-08-03 12:08:14 -07:00
Seiji Emery
883aa7af8d changed gl calls to gpu:: 2015-08-03 11:58:38 -07:00
samcake
85077604dc Merge pull request #5478 from jherico/marge 
CORE BRANCH - More shader fixes
 2015-08-03 10:25:33 -07:00
Brad Davis
53feaf2ab6 More shader fixes 2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -07:00
Brad Davis
1712ab322f Fixing includes in test code 2015-07-31 17:46:47 -07:00
Stephen Birarda
22ead79988 fix another char allocation in PacketTests 2015-07-31 17:30:22 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Seiji Emery
fe74ec3f89 copied starting point from render-utils-test 2015-07-31 14:42:45 -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
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Howard Stearns
4e7d191fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 18:53:38 -07:00
Howard Stearns
d73f133daa Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 15:45:00 -07:00
Howard Stearns
838711e526 Remove avatar->shift hips for idle animations. 
See https://app.asana.com/0/32622044445063/43127903156601
 2015-07-29 15:27:50 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Sam Gateau
17650dde74 Solving the coimpiling issue with Render-utils test 2015-07-29 11:49:22 -07:00
Andrew Meadows
a1e6fdc4b2 Merge pull request #5435 from MarcelEdward/hifi-2-20069 
Hifi 2 20069
 2015-07-29 11:13:30 -07:00
Howard Stearns
12d449f69d Update test case initialization post cauterization changes. 2015-07-29 09:55:46 -07:00
Howard Stearns
66621d31e8 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-29 09:26:36 -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
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Andrew Meadows
ef5e7e9ccc remove PlaneShape dependency from GeometryUtils 
also add unit tests for indRayRectangleIntersection()
 2015-07-28 15:45:48 -07:00
SamGondelman
782a5c491e removed hand lasers because they had been renamed so they weren't removed 2015-07-28 12:56:31 -07:00
Andrew Meadows
d03a7d1b70 fix physics-tests build errors 2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610 fix build errors for shared-tests 2015-07-28 12:05:45 -07:00
Howard Stearns
e7516aab02 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-28 11:17:35 -07:00
Atlante45
8b71462dc1 Remove unnecessary headers 2015-07-28 10:36:00 -07:00
Brad Davis
a049b14d13 Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 10:04:19 -07:00
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
Howard Stearns
98fe6dbf3d Rename tests/rig to tests/animation, per Tony. 2015-07-27 14:13:54 -07:00
Howard Stearns
51a12adc08 Less dependencies in tests. 2015-07-27 14:02:47 -07:00
Howard Stearns
146ddd2240 Cleanup false starts. 2015-07-27 13:42:18 -07:00
Howard Stearns
8196770ed3 Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on. 2015-07-27 12:58:43 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Howard Stearns
1d99057052 Debug printouts in tests. 2015-07-24 16:08:47 -07:00
Howard Stearns
cff7bb703e Test evolution. 2015-07-24 14:08:30 -07:00
Howard Stearns
cc26f5165b Supply neck index per new protocol. 2015-07-23 15:40:33 -07:00
Howard Stearns
eea3ce4369 Make an actual rig in the test case. 2015-07-23 15:11:21 -07:00
Howard Stearns
5a0c1a9402 Checkpoint testing stuff. 2015-07-22 21:03:48 -07:00
SamGondelman
e27ba86f75 fixing merge issues with plugins 2015-07-22 14:57:59 -07:00
Howard Stearns
8173dc2c9a Remove text extensions reference that isn't needed and which has changed underneath us. 2015-07-22 14:21:42 -07:00
Howard Stearns
a161f527c4 Comments documenting direction and questions. 2015-07-22 11:41:24 -07:00
Howard Stearns
dbb4a8b767 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 11:40:25 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Howard Stearns
ed815a0573 Reflect dependencies in unit test setup. 2015-07-17 16:53:41 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
Howard Stearns
d8287ac2b4 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-17 14:53:10 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Brad Davis
e6e9f017c0 Fixing test code 2015-07-16 17:23:25 -07:00
Howard Stearns
a529cce626 Empty test suite and instructions. 2015-07-16 14:36:28 -07:00
Ryan Huffman
6f112f38c3 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 07:57:18 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Ryan Huffman
9a3ba20f11 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:02:17 -07:00
Ryan Huffman
d9b962c4d9 Add packet tests 2015-07-15 15:02:08 -07:00
Ryan Huffman
07e3cf1348 Add COMPARE_DATA to QTestExtensions 2015-07-15 15:01:56 -07:00
Atlante45
501460d489 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-15 13:14:36 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Stephen Birarda
f0e07d424d Merge branch 'atp' into packet-tests 2015-07-15 11:02:52 -07:00
Stephen Birarda
3cd2887a08 add initial packet tests 2015-07-14 16:11:29 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades 
Remove old octreeFade code that wasn't working anyway
 2015-07-14 10:24:01 -07:00
Howard Stearns
5196648b22 Remove obsolete enum member. 2015-07-14 09:57:19 -07:00
Seth Alves
7a6cf40b54 quiet compiler 2015-07-13 07:39:11 -07:00
Seth Alves
5aca0c28ef quiet compiler 2015-07-13 07:37:59 -07:00
Howard Stearns
d1952583ab Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades 2015-07-13 07:24:08 -07:00
Seth Alves
f011d5c7f7 remove commented code 2015-07-12 20:42:17 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Brad Davis
eb9d52fbb3 Helps to actually commit the fix 2015-07-10 16:11:56 -07:00
Brad Davis
3db3676fae Fixing compile failure 2015-07-10 15:26:22 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -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
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Seiji Emery
1fc1c7c794 PR Fixes 2015-07-02 17:29:08 -07:00
Seiji Emery
28543c0bf2 PR Fixes 2015-07-02 17:27:00 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Seiji Emery
8e324f5de2 Fixes 2015-06-29 11:29:10 -07:00
Seiji Emery
b47cb76e3c Removed all-tests from ALL_BUILD 
temp-fix for broken builds
 2015-06-26 15:44:15 -07:00
Seiji Emery
3bddfc58e9 debug 2015-06-26 14:16:12 -07:00
Seiji Emery
5d5b4dd2f4 ... 2015-06-26 13:52:12 -07:00
Seiji Emery
39a6a39f4d bugfix 
should fix the build…
 2015-06-26 13:48:48 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
67093cb9bd Refactoring 
Renamed QFUZZY_COMPARE to QCOMPARE_WITH_ABS_ERROR (and the fuzzyCompare function to getErrorDifference)
 2015-06-24 16:34:03 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Seiji Emery
00900d6906 Rewrote MovingPercentileTests 
(hope someone uses this...)
 2015-06-24 14:46:01 -07:00
Seiji Emery
735c4a7dcf bugfix 2015-06-23 17:45:02 -07:00
Seiji Emery
0f97d95c2f Removed debug info from cmake files 2015-06-23 17:18:18 -07:00
Seiji Emery
1f0d9a250a Reverted render-utils and ui tests to be manual tests (not unit tests, and not incorporating QtTest). 2015-06-23 17:13:43 -07:00
Seiji Emery
57b86c0762 Added docs for QTestExtensions.h 2015-06-23 15:27:49 -07:00
Seiji Emery
ede365acc6 Updated AngularConstraintTests 2015-06-23 13:51:26 -07:00
Seiji Emery
cbfd8485e4 Added an implementation stub for JitterTests 
(the current tests take port and ip address info via command line args, and would be non-trivial to reimplement using QtTest.
The original tests can be run by #defining RUN_MANUALLY in the source file, and running jitter-JitterTests).
 2015-06-23 11:50:31 -07:00
Seiji Emery
5a9d2a4d9c Updated audio-tests 2015-06-23 11:38:22 -07:00
Seiji Emery
da04442f85 Updated networking-tests 2015-06-23 11:25:43 -07:00
Seiji Emery
4cb1dddb89 Refactored OctreeTests to use QtTest. 
Note: unit tests currently fail, so that needs to be looked into.
 2015-06-23 11:05:53 -07:00
Brad Davis
d4b9a739f5 Still working on GL update 2015-06-23 09:49:10 -07:00
Brad Davis
fbf3a0cbe6 Working on GL 4 2015-06-23 09:48:16 -07:00
Bradley Austin Davis
0000b5a8c8 Working on GL 4.1 core 2015-06-23 09:48:15 -07:00
Seiji Emery
dfe58a5ed4 Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point. 2015-06-22 17:42:07 -07:00
Seiji Emery
c61b38f5e6 finished physics tests 2015-06-22 16:25:26 -07:00
Seiji Emery
0d9a661839 physics test cleanup 2015-06-22 15:55:34 -07:00
Seiji Emery
c2b7f70d2b ShapeColliderTests now uses QtTest 2015-06-22 15:25:24 -07:00
Seiji Emery
01c85e0a2c cleanup 2015-06-22 10:17:26 -07:00
Seiji Emery
16dd5e0590 Added a custom test macro, QFUZZY_COMPARE (compares two values with an explicit error tolerance), and the infrastructure for defining more. 
Reworked physics test files, but they're a WIP.
 2015-06-21 09:29:09 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seiji Emery
64922ecc62 Setup cmake build files for QtTest-based unit tests. 2015-06-19 21:39:34 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Atlante45
0384b74479 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:37:53 +02:00
Andrew Meadows
0c6de897f5 replace tab with spaces 2015-05-28 12:26:29 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
andrew
2a6955ce12 fix windows build 2015-05-27 09:14:11 -07:00
Andrew Meadows
39d8244255 use highfideltiy style for class data member names 2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c replace tabs with spaces 2015-05-26 22:53:57 -07:00