Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 07:34:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46210 commits 6 branches 1 tag 1.1 GiB
Commit graph

927 commits

Author SHA1 Message Date
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Sam Cake
7e59d5cc04 Fixing the failing test for shader compilations (because we removed the shadowing shaders) 2015-12-07 01:27:50 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Brad Hefta-Gaub
15c4dbfb11 Merge pull request #6554 from Atlante45/warnings 
Last of the OpenGL warnings on OS X
 2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Atlante45
528a17422d Last of the OpenGL warnings on OS X 2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1 Fixing tests, moving some plugin container stuff to base class 2015-12-04 10:28:19 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
6fbb67021f Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix 
Fix for mirrored transforms in FBX models
 2015-12-03 17:01:21 -08:00
Anthony J. Thibault
99223d0a3c AnimExpression: support for parsing simple expressions 
supports parens, binary +, -, / and *.
/ and * have higher precedence then + and -
 2015-12-03 15:02:00 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00
Anthony J. Thibault
710ce7e639 Merge branch 'master' into tony/anim-expressions 2015-12-03 09:56:28 -08:00
Anthony J. Thibault
4f836568ad Tests to verify AnimPose decomposition is working. 2015-12-02 17:26:32 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Anthony J. Thibault
0b410ecd92 RigTests build again 2015-11-21 11:09:31 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Leonardo Murillo
9ad865c7f0 checkpoint 2015-11-20 15:19:45 -06:00
Brad Hefta-Gaub
4a0a481ac6 more fixes 2015-11-10 08:44:51 -08:00
Atlante45
767a7a7f1e Fix warnings on OS X 2015-11-09 14:26:23 -08:00
samcake
7890aa6ec1 Merge pull request #6333 from jherico/rec2 
Adding clip serialization implementation, tests
 2015-11-06 16:38:39 -08:00
Brad Davis
bf70ae4724 PR feedback 2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
Brad Davis
4513b638db Adding clip serialization implementation, tests 2015-11-06 14:40:21 -08:00
Brad Davis
1dc392bb36 Merge pull request #6330 from Atlante45/master 
// FIXME incredibly evil....
 2015-11-06 11:43:33 -08:00
Brad Davis
0bf29a441f Add recording classes 2015-11-06 11:14:46 -08:00
Atlante45
c53c0ec53f Fix double delete on shutdown 2015-11-06 11:13:10 -08:00
Anthony J. Thibault
431a108c35 Bugfixes to expression for !!x expressions 
Added stub eval methods. only boolean not, boolean and, boolean or and unary minus
are implemented.
 2015-11-04 20:13:17 -08:00
Anthony J. Thibault
04d8a598da First step toward evaluation 
* added OpCodes
* added first parser rules
* removed mat4 support from AnimVariantMap
 2015-11-04 16:56:34 -08:00
Anthony J. Thibault
32c40d37c0 Removed vec literals tokens and renamed int and float token types 2015-11-04 14:51:05 -08:00
Anthony J. Thibault
7f0fc4f6eb Added limited floating point support 2015-11-04 14:51:05 -08:00
Anthony J. Thibault
340096d457 Initial version of AnimExpression class with minimal tokenizer 2015-11-04 14:51:05 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Anthony J. Thibault
f7b6fab0c3 Merge branch 'master' into tony/anim-sync-blend 2015-10-29 11:35:48 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Brad Davis
d61b3e5790 Fixing controller link requirements 2015-10-28 17:41:52 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Brad Davis
ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-10-27 09:41:58 -07:00
Atlante45
9bead94fae Remove cmake debug code 2015-10-26 12:07:12 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
5a0bb4c31b Fixing line endings 2015-10-19 16:51:31 -07:00
Anthony J. Thibault
15f3894001 AnimTests: added tests for accumulateTime 2015-10-19 15:49:53 -07:00
Anthony J. Thibault
8e7e94c501 AnimTests: now compile and pass again. 2015-10-19 15:49:51 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
293b7c12e1 change join to makeAxis, fix some warnings 2015-10-17 12:46:05 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Brad Davis
195045a4ec Next time remember to hit build all before commiting 2015-10-14 17:20:30 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
samcake
3d5bf9aa1a merging with current upstrem 2015-10-14 09:41:11 -07:00
samcake
fb4ff240ef Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-13 09:16:00 -07:00
Brad Davis
8a0540234c Find the joystick controller dynamically 2015-10-12 18:50:19 -07:00
samcake
dc32d5ae8d Current status of my code for json 2015-10-12 18:03:21 -07:00
Brad Davis
58d3578fb1 Making anonymous mappings work 2015-10-12 17:59:01 -07:00
Brad Davis
f77878ee79 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-12 11:05:28 -07:00
Brad Davis
14f511350d Working on refactoring the xbox hardware access and wiring up test code 2015-10-12 10:47:23 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
14f33258ae Working on test code, new controller interface 2015-10-10 16:08:44 -07:00
Brad Davis
52c65b917f Merge remote-tracking branch 'upstream/master' into controllers 2015-10-10 12:48:49 -07:00
Brad Davis
9e4a7a6226 Working on controller refactoring 2015-10-10 03:05:42 -07:00
Brad Davis
c3775623aa Splitting files, adding test skeleton 2015-10-09 17:23:52 -07:00
Atlante45
3e71c4cc4e CR 2015-10-09 13:18:05 -07:00
Stephen Birarda
7bd98354d8 add override to supress warnings in ui-test 2015-10-05 15:53:52 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Brad Hefta-Gaub
5a80c4d0e7 Merge pull request #5886 from samcake/calvin 
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
 2015-09-23 19:13:28 -07:00
samcake
7d8f3661ad coding standard 2015-09-23 17:49:03 -07:00
samcake
b8e630a7a7 Less Warnigns 2015-09-23 17:46:10 -07:00
samcake
9c44c3e4a4 Removing warnings 2015-09-23 16:19:34 -07:00
samcake
83116fdd85 Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced 2015-09-23 15:20:39 -07:00
samcake
8735aa8003 Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux 2015-09-23 12:19:17 -07:00
Anthony J. Thibault
a9848cd157 Merge branch 'master' into tony/lean-threshold 2015-09-23 10:54:12 -07:00
Brad Hefta-Gaub
9436d2922f more warnings fixes 2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
52842cb287 more warnings fixes 2015-09-22 20:34:40 -07:00
Anthony J. Thibault
9ce43a57f1 Better head IK when in an HMD. 
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
 2015-09-22 19:58:21 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Brad Davis
deaa4a747b Batch side implementation of multi-draw indirect 2015-09-22 15:56:58 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Anthony J. Thibault
5aeebba90e Renamed AnimController to AnimManipulator, Removed offsets on IK targets 2015-09-16 15:49:47 -07:00
Anthony J. Thibault
70f5835278 Updated left hand point and grab State Machine and animations 2015-09-15 18:00:13 -07:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines 
Added point and grab support to the AnimGraph
 2015-09-15 15:47:19 -07:00
Anthony J. Thibault
1948829ca8 Improved state machine for right hand. 
The hand state machine has the following features

* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.

Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
 2015-09-15 15:09:08 -07:00
Anthony J. Thibault
90f46ba2c8 Added hand state machines to AnimGraph. 
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
  the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
 2015-09-14 18:54:12 -07:00
Andrew Meadows
75ec142827 fix animation-tests 2015-09-14 16:42:57 -07:00
Seth Alves
61c9da1d27 minimize diff 2015-09-12 10:43:20 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Anthony J. Thibault
7996a02bd8 Added head target to AnimGraph IK node. 
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
  default to the underlying pose position.
 2015-09-11 09:48:48 -07:00
Anthony J. Thibault
663e37da66 Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00 Merge pull request #5731 from ChristophHaag/master 
build fixes
 2015-09-10 11:36:45 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Howard Stearns
745872f914 More variants tests. 2015-09-09 15:45:23 -07:00
Anthony J. Thibault
756eb54a0a AnimNodeLoader support for InverseKinematics node. 2015-09-09 15:28:21 -07:00
Howard Stearns
738da0116a Simplify timer use. 2015-09-09 15:19:01 -07:00
Anthony J. Thibault
146836452f Merge remote-tracking branch 'andrew/europium' into tony/ik-and-controllers 2015-09-09 09:40:55 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Andrew Meadows
ee265aba4a add AnimInverseKinematics class 2015-09-08 18:20:22 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Christoph Haag
6a8f131a83 move assert into ifndef QT_NO_DEBUG it belongs to 2015-09-08 10:07:06 +02:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
46b3a7fd23 Improved default avatar.json state machine. 
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
 2015-09-02 17:28:06 -07:00
Anthony J. Thibault
d13a188dde Compile fixes and added test case to verify onDone and onLoop triggers 2015-09-02 10:31:45 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Anthony J. Thibault
9786954585 Added support for onDone and onLoop triggers. 2015-08-31 12:13:05 -07:00
Anthony J. Thibault
9d983e0614 Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader. 
Also updated avatar.json to test nested graphs under a SM.
 2015-08-28 17:16:32 -07:00
Anthony J. Thibault
21c6ba9bdf updated avatar.json to match current gist. 2015-08-27 21:27:37 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine. 
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
 2015-08-27 20:41:53 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -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
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Anthony J. Thibault
0c02a338f2 Added support for setting Variants in the json file. 
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
 2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63 AnimVariantMap is used in eval, MyAvatar loads avatar.json via url 2015-08-25 20:28:17 -07:00
Anthony J. Thibault
496c706bba Added AnimVariantMap argument to evaluate. 2015-08-25 11:59:24 -07:00
Anthony J. Thibault
62f86e6a46 Added AnimVariant, renamed AnimClipTests to AnimTests. 
* Added test for AnimVariant.
 2015-08-25 11:33:57 -07:00
Anthony J. Thibault
7a2ca047cb Added network resource download support to AnimNodeLoader. 2015-08-24 19:00:12 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Anthony J. Thibault
fa5256eefd Merge branch 'master' into ajt/new-anim-system 2015-08-24 14:32:28 -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
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -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
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