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
