Atlante45
51168a8a29
Explicitely cast to float
2016-02-11 09:35:31 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
Clément Brisset
c3218a3af9
Merge pull request #7069 from AndrewMeadows/another-crash-fix
...
Fix crash when propagating simulation ownership on deleted objects
2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb
Rework the qml for brevity
2016-02-11 08:48:01 -08:00
Zach Pomerantz
86412c1890
Fix default debug buffer size
2016-02-11 08:47:59 -08:00
Zach Pomerantz
991d6328ef
Fix JSON integration for JobConfig
2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0
Integrate JobConfig with JSON/qml
2016-02-11 08:47:51 -08:00
Brad Hefta-Gaub
d77d102384
add support for persisting the mono preview mode option
2016-02-10 22:01:17 -08:00
Seth Alves
3a2b082a7f
remove incorrect assert
2016-02-10 20:47:22 -08:00
Seth Alves
ffce38769f
properties hold local velocities, not world-frame ones
2016-02-10 19:16:08 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Seth Alves
3fe01ccf10
cleanups
2016-02-10 18:32:05 -08:00
Seth Alves
3e71efcdbb
all code that asks isMoving appears to mean relative to parent
2016-02-10 18:21:44 -08:00
Andrew Meadows
ac60917b54
sigh... protect againt null MotionStates
2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3
manually removing contact manifolds was a bad idea
2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8
remove all contact info before removing objects
2016-02-10 17:58:38 -08:00
Seth Alves
3f922240d0
clean up handling of success flag and some debugging prints
2016-02-10 16:42:13 -08:00
Seth Alves
1ae47b17f0
size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent
2016-02-10 16:41:35 -08:00
samcake
6922c9adf0
updating all the entity types when their bound is changing
2016-02-10 16:41:09 -08:00
Atlante45
f32562b191
Coding standard
2016-02-10 16:35:06 -08:00
Atlante45
1e3bf67fab
Fix division by 0
2016-02-10 16:35:06 -08:00
Stephen Birarda
97cd65cf80
don't use usecTimestampNow for per second actions
2016-02-10 15:07:58 -08:00
Andrew Meadows
d121dab937
Merge pull request #7057 from sethalves/grab-then-equip
...
Grab then equip
2016-02-10 14:16:31 -08:00
Seth Alves
3b1db7a522
Merge pull request #7061 from AndrewMeadows/crash-fix
...
Fix crash when deleting many moving dynamic objects.
2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608
don't return void
2016-02-10 13:49:03 -08:00
Andrew Meadows
8ddbce1ee2
Merge pull request #7059 from sethalves/clamp-ik-dt
...
avoid crazy ik-induced shaking / orbits
2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116
Merge pull request #7062 from jherico/webentitiies
...
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 13:27:59 -08:00
samcake
b295a3732e
Fix a bunch of warnings
2016-02-10 12:18:46 -08:00
Seth Alves
af6bb50f74
fix warning
2016-02-10 12:09:28 -08:00
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e
Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes
...
SpatiallyNestable: bug fixes for kinematic entities
2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396
also make sure tau is >= 1.0
2016-02-10 11:20:56 -08:00
Andrew Meadows
84fb983da7
don't forget to remove from _outgoingChanges
2016-02-10 10:36:35 -08:00
Andrew Meadows
4bcb7b1ba9
more correct profiling
2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da
constify and explicit override
2016-02-10 10:36:34 -08:00
Seth Alves
b3b053ce18
if delta-time is more than 1/30th of a second, clamp it to avoid crazy ik induced orbits when main thread is blocked
2016-02-10 09:52:29 -08:00
samcake
9326aebf20
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-10 09:38:54 -08:00
Ken Cooke
a875542142
Merge pull request #7053 from birarda/integrate-new-hrtf
...
Integrate the new audio HRTF in AudioMixer
2016-02-10 07:34:50 -08:00
samcake
5ef7a19d67
Drafting a solution to update the render items when ENtity is moving
2016-02-09 18:29:22 -08:00
Anthony J. Thibault
727e289ecd
SpatiallyNestable: bug fixes for kinematic entities
...
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Stephen Birarda
ac0db04892
repair to wrapped memcpy from AudioRingBuffer
2016-02-09 16:39:22 -08:00
samcake
8a4e2cb0c5
cleaning the warnings coming from the os side
2016-02-09 16:27:40 -08:00
samcake
da158bcd85
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-09 15:52:28 -08:00
samcake
c96dd7f131
Cleaning up of the octree as items are removed
2016-02-09 15:51:38 -08:00
Stephen Birarda
cafcb6b109
remove degree conversion that is not used
2016-02-09 15:25:10 -08:00
Stephen Birarda
5c9f673e38
fix for missing M_PI
2016-02-09 15:05:19 -08:00
Seth Alves
251810edc5
only suppress location edits when they arrive over the network -- script can still update
2016-02-09 15:03:36 -08:00
Stephen Birarda
7b2726f89b
ensure that injectors are cleaned up once inactive
2016-02-09 14:30:59 -08:00
Stephen Birarda
1773233af4
cleanup management of HRTF objects across connected Nodes
2016-02-09 14:30:44 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006
SpatiallyNestable: warn on failure.
2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844
Merge pull request #7049 from jherico/antistutter
...
Anti-stutter work
2016-02-09 12:16:15 -08:00
Stephen Birarda
a6a694c704
fix mixing bugs post HRTF integration
2016-02-09 11:58:55 -08:00
Chris Collins
cc576dd5e3
Merge pull request #7045 from sethalves/fix-query-cube
...
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Brad Davis
7d99f9e72f
PR comments
2016-02-09 10:16:44 -08:00
Brad Davis
839b8d432e
Don't burn CPU cycles calculating an average color we don't use
2016-02-09 09:39:34 -08:00
Brad Davis
2b127720f8
Run the present thread at highest priority
2016-02-09 09:39:33 -08:00
samcake
b1b08bf2f7
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-09 09:24:55 -08:00
Chris Collins
e61636e8a7
Merge pull request #7028 from zzmp/fix/overlay
...
Add transparency and layering for overlays
sam is doing it
2016-02-09 09:18:32 -08:00
Brad Davis
421160eeb6
Make the file parsing threads run at lower priority
2016-02-08 23:55:02 -08:00
Anthony J. Thibault
6a82594a4f
SpatiallyNestable: more locks, less contention
2016-02-08 20:09:32 -08:00
Anthony J. Thibault
9a0e206843
SpatiallyNestable: made getParentPointer protected again.
2016-02-08 20:04:45 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
samcake
40e49b2376
Starting to remove empty bricks and empty cells
2016-02-08 18:23:29 -08:00
Stephen Birarda
fd96f0d960
leverage new HRTF in audio-mixer mix preparation
2016-02-08 18:12:25 -08:00
samcake
07759bb5db
Merge pull request #7034 from zzmp/feat/render-to-json
...
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
James B. Pollack
ad36e84e24
Merge pull request #7023 from ericrius1/acSoundSearcher
...
AC Sound Searcher
2016-02-08 17:54:15 -08:00
Brad Hefta-Gaub
89648f3c2e
Merge pull request #7044 from jherico/optional_threaded_present
...
Make threaded present optional
2016-02-08 17:17:31 -08:00
Zach Pomerantz
63d87550b1
Guard batchSetter invocation for ShapePipelines
2016-02-08 17:06:43 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
ericrius1
b60ba0c5a7
can now change loop
2016-02-08 16:22:05 -08:00
Zach Pomerantz
281ba3c3ea
Fix ShapeKey::withoutCullFace to set, not reset
2016-02-08 16:14:03 -08:00
Anthony J. Thibault
97bcc54360
CharacterController: separate target velocity from parent velocity.
...
Also, disable damping on the rigidBody used by the CharacterController.
2016-02-08 16:01:36 -08:00
Stephen Birarda
445662f5ae
clean sweep of old now unused audio files
2016-02-08 15:38:12 -08:00
Stephen Birarda
7dee3c61f3
Merge pull request #7038 from kencooke/master
...
HRTF-based audio spatialization engine
2016-02-08 15:37:09 -08:00
Seth Alves
4f8a7a080f
remove debugging print
2016-02-08 15:33:03 -08:00
Seth Alves
82fcfc1d64
don't apply clock-skew to a lastEdited of 0
2016-02-08 15:31:32 -08:00
Seth Alves
e2098038f1
only setLastEdited on properties to be sent
2016-02-08 15:16:15 -08:00
Seth Alves
eb1c159c7e
only setLastEdited on properties to be sent
2016-02-08 15:16:04 -08:00
Seth Alves
5b5ddebb1a
set last-edited when updating a child's queryAACube
2016-02-08 15:09:51 -08:00
Seth Alves
92d016f03a
debugging prints for queryAACube
2016-02-08 15:09:34 -08:00
Seth Alves
44ddfb8039
set last-edited when updating a child's queryAACube
2016-02-08 15:08:58 -08:00
Ken Cooke
0968118ef7
Removed the commented-out AVX2 detection
2016-02-08 14:51:14 -08:00
Anthony J. Thibault
2667fe3c24
Merge branch 'master' into tony/avatar-on-moving-platform
2016-02-08 14:32:46 -08:00
Anthony J. Thibault
20a38f613e
Rig: remove position delta based velocity.
...
In general, the physics body velocity is MUCH more behaved now.
2016-02-08 14:30:28 -08:00
Brad Davis
390df78327
Make threaded present optional
2016-02-08 14:10:51 -08:00
Zach Pomerantz
a7bafed61b
Change ShapeKey::CULL to NO_CULL_FACE
2016-02-08 13:44:42 -08:00
Zach Pomerantz
9e5df79279
Add tone-mapping to overlay emissive shader
2016-02-08 13:31:12 -08:00
Zach Pomerantz
1d2acbe47e
Bring GeometryCache render*Instance up to standard
2016-02-08 13:28:14 -08:00
ericrius1
bad4a5d601
changed ac script to take into account duration
2016-02-08 12:49:56 -08:00
ericrius1
c169a7cdd5
calculating clip length
2016-02-08 12:36:14 -08:00
ericrius1
6b240dfd5f
calculating length of wav file
2016-02-08 12:34:46 -08:00
Philip Rosedale
63afa8c1ed
Merge pull request #7040 from hyperlogic/tony/landing-animation
...
MyAvatar: added standing and run landing animations
2016-02-08 11:38:12 -08:00
samcake
ad3f3a6dcf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-08 10:30:54 -08:00
Brad Hefta-Gaub
7939f1381c
Merge pull request #7036 from jherico/qml
...
Fix native text rendering by forcing positions to integer values
2016-02-08 09:45:57 -08:00
Anthony Thibault
c4f9a4805c
MyAvatar: moving platform support
...
* pass sum of desired and parent velocity onto avatar's character controller.
* pass local position and velocity to Rig for animation purposes.
2016-02-07 14:07:40 -08:00
Brad Hefta-Gaub
3f0ebf7732
Merge pull request #7031 from AndrewMeadows/simulation-ownership
...
server can clear simulation ownership
2016-02-06 19:19:39 -08:00
Ken Cooke
e2066c7719
Disabled AVX support on Mac. XCode is still missing __builtin_cpu_supports (added to Clang in Jul 2015?)
2016-02-06 11:22:19 -08:00
Ken Cooke
3d684dd0e7
Refactor AVX code for separate compilation and runtime dispatch
2016-02-06 10:55:23 -08:00
Brad Hefta-Gaub
7e22ac997a
Merge pull request #7029 from birarda/atp-test
...
fix ATP SendQueue failure to receive after re-activity
2016-02-05 19:36:53 -08:00
Brad Hefta-Gaub
eebf6f8883
Merge pull request #7021 from hyperlogic/tony/animation-mirror-support
...
AnimClip: Animation mirror support
2016-02-05 19:25:01 -08:00
samcake
76d8135fdc
Trying to introduce the Filtering step after the full scene culling
2016-02-05 18:21:21 -08:00
Anthony J. Thibault
d24a024726
MyAvatar: added standing and run landing animations
2016-02-05 17:53:50 -08:00
Ken Cooke
96f1191a97
Compiler fixes
2016-02-05 17:46:26 -08:00
Ken Cooke
7a07e57144
Compiler fixes
2016-02-05 17:27:33 -08:00
samcake
91a28c597a
Quiet warnings
2016-02-05 17:18:14 -08:00
Philip Rosedale
a98efbc660
Merge pull request #6997 from jagwire/WorkingEnergy
...
Working energy usage for entity manipulation.
2016-02-05 17:17:45 -08:00
samcake
502abd3e93
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-05 16:50:18 -08:00
samcake
e5f3805d0e
Fixing the item insert in cell criteria for subcell and adding debgging tool
2016-02-05 16:49:43 -08:00
Ken Cooke
ad0383114b
Compiler fixes
2016-02-05 16:34:04 -08:00
Ken Cooke
1a1b34296c
Compiler fixes
2016-02-05 15:44:31 -08:00
Ken Cooke
721fa9d43a
HRTF-based audio spatialization engine
2016-02-05 15:24:09 -08:00
Andrew Meadows
09bdccb18c
Merge pull request #7032 from hyperlogic/tony/standing-jump
...
MyAvatar: Standing Takeoff and In-Air Animations
2016-02-05 13:45:52 -08:00
Zach Pomerantz
c334e4ebcb
Add JSON interface to render::Job::Config
2016-02-05 13:03:47 -08:00
Zach Pomerantz
8bf6c66327
Add (de)serializer for QObject->JSON
2016-02-05 13:03:46 -08:00
Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
Zach Pomerantz
d9132f3973
Clean up geometry instanced calls
2016-02-05 11:22:45 -08:00
Zach Pomerantz
b0a9c299ed
Add tone mapping to overlay shaders
2016-02-05 11:18:42 -08:00
Anthony J. Thibault
f13e31c7fc
CharacterController: removed unnecessary code.
2016-02-05 10:53:58 -08:00
Zach Pomerantz
a1ed29e6f8
Rename setupTransparent->setupBatch
2016-02-05 10:53:01 -08:00
Babiuch, Ryan Nicholas
aab98db812
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-05 12:49:38 -06:00
Zach Pomerantz
aa50d1e98e
Add factor and shading to overlay/translucent light shaders
2016-02-05 10:27:07 -08:00
samcake
57b6ad3c54
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-05 09:23:31 -08:00
Anthony J. Thibault
bfeace78f7
AnimInverseKinematics: warning fixes
2016-02-04 18:51:48 -08:00
samcake
a999e046b5
Showing the LOD angle
2016-02-04 17:59:35 -08:00
Anthony J. Thibault
51189cfc50
AnimInverseKinematics: opened up UpLeg and Leg constraints
...
This improves the quality of the jump animations, while IK is enabled.
2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26
MyAvatar: Standing Takeoff and In-Air Animations
...
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.
CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
2016-02-04 17:56:07 -08:00
Zach Pomerantz
a4cea0a307
Conform model/overlay shaders
2016-02-04 16:21:56 -08:00
Brad Hefta-Gaub
817245accc
Merge pull request #7025 from jherico/qml
...
QML Work
2016-02-04 16:03:39 -08:00
Zach Pomerantz
44d297e7e2
Differentiate named calls by pipeline
2016-02-04 15:32:47 -08:00
Zach Pomerantz
f0797d8ea0
Move instanced pipeline setup to lambda from batch
2016-02-04 15:32:28 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 16:50:43 -06:00
Bradley Austin Davis
dc0e038535
Add drive selection to the file dialog
2016-02-04 13:51:43 -08:00
Stephen Birarda
42e9a4ebf0
fix ATP SendQueue failure to receive after re-activity
2016-02-04 13:43:50 -08:00
Bradley Austin Davis
64597f9d9f
Fixing save dialog issues saving new files
2016-02-04 13:32:52 -08:00
Andrew Meadows
2da46ff26a
server-side release ownership
2016-02-04 13:26:07 -08:00
Andrew Meadows
af57f5d120
add simple and fast DirtyOctreeElementOperator
2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d
flag entity as changed when changing simulatorID
2016-02-04 13:26:07 -08:00
Andrew Meadows
91a2f86482
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
381049acb3
clear simulation ownership when owners vanish
2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5
fix spelling typo in comment
2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2
make some methods const
2016-02-04 13:26:06 -08:00
Anthony J. Thibault
a8e092272c
AnimStateMachine: added new State parameter interpType
...
interpType defines how the interpolation between two states is performed.
* SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
interTarget frame. Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
* SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins. However the target state is
evaluated dynamically. During the interpolation period the previous snapshot is interpolated with the target pose
to produce smooth motion between them. This mode is useful for interping into a blended animation where the actual
blend factor is not known at the start of the interp or is might change dramatically during the interp.
2016-02-04 10:32:58 -08:00
samcake
cc7f03e7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-04 10:29:41 -08:00
Zach Pomerantz
cb06d4a9e4
Fix -Wunused-variable for geometry solid stream formats
2016-02-04 10:13:35 -08:00
Zach Pomerantz
9e7e6be549
Fix -Wunused-variable for MeshPart ShapeKeys
2016-02-04 10:06:07 -08:00
Zach Pomerantz
0c31c072a3
Fix -Wreorder for DrawOverlay3D ctor
2016-02-04 10:03:35 -08:00
