Seth Alves
31c2b8fea9
oops
2018-02-07 16:31:38 -08:00
Seth Alves
b6ac348428
get children of animated entity joints to follow along, again
2018-02-07 16:30:07 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Sam Gateau
e08e64b573
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-26 19:43:07 -08:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Dante Ruiz
2d70e76546
fix merge conflict
2018-01-22 15:15:11 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Seth Alves
c622cd8293
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 13:39:16 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
Seth Alves
0ad4cdc41b
works now
2018-01-18 13:15:47 -08:00
amantley
961ed88fb0
fixed coding standards in RenderableModelEntityItem.cpp
2018-01-18 12:56:24 -08:00
amantley
1c97272767
Cleaned up the code a bit so that there is no need for a new class variable for properties to verify the change of url
2018-01-18 12:09:28 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
amantley
9f484a7f57
Removed extraneous comments in RenderableItemEntity.cpp and .h
2018-01-18 08:54:05 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
amantley
4eb2a5cf5e
added a property check in renderableModelEntity for the animation url this fixes the bug stopping you from changing animations on an entity
2018-01-17 19:25:20 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
Dante Ruiz
283b9a8003
fix softEntity edge cases
2018-01-12 15:31:54 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Anthony J. Thibault
088f227df2
Pass model offset from avatar skeletonModel to attached entity
2018-01-12 10:26:02 -08:00
Seth Alves
227dbd6f68
put this back to a working state
2018-01-12 08:52:07 -08:00
Seth Alves
9d4ab13a10
cauterize all head-based entities rather than just models
2018-01-11 19:45:15 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
Dante Ruiz
980807c657
make changes
2018-01-10 16:50:41 -08:00
SamGondelman
df574c6bc9
keep requesting render update until textures load
2018-01-10 13:19:53 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Sam Gondelman
5cf25a20c9
use correct model ptr
2018-01-04 21:21:58 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
Dante Ruiz
527d00871a
making relaying translation work
2018-01-04 11:57:51 -08:00
Dante Ruiz
e1a7f9bfb8
working on imporving soft-entities
2018-01-03 08:47:11 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
Dante Ruiz
be9bf31843
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-02 08:04:26 -08:00
druiz17
0ebbb76b49
fixed property over written issue and start relaying joints
2017-12-29 16:12:40 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Dante Ruiz
77874de909
fix spacing
2017-12-21 15:05:23 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Dante Ruiz
ddddcae932
Merge branch 'master' of github.com:highfidelity/hifi into entity-joints
2017-12-21 08:29:56 -08:00
Dante Ruiz
29f0835475
making entity joints work again
2017-12-20 16:06:19 -08:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Andrew Meadows
bad2c1df76
proper modulus of animation frame
2017-12-19 10:40:17 -08:00
Andrew Meadows
559cb33563
remove incorrect comment
2017-12-19 10:40:17 -08:00
Andrew Meadows
661a63bd0c
fix crash for bad QVector index
2017-12-19 10:40:17 -08:00
amantley
29538851b6
Made the changes from the latest code review, except getting rid of the
...
while loop.
2017-12-12 09:06:43 -08:00
amantley
65bb896450
Merge remote-tracking branch 'origin/master' into character_entity_fixes
2017-12-11 10:55:54 -08:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -08:00
Ryan Huffman
f3fc5769e8
Move asset baking on asset server to separate process
2017-12-06 11:49:19 -08:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
ZappoMan
750d505f9b
fix issues in model import sizing caused by recent refactor
2017-11-30 17:51:59 -08:00
amantley
233d693d76
removed debug print statements and fixed negative FPS handling
2017-11-29 10:51:04 -08:00
amantley
778d98f56b
made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function
2017-11-28 18:42:03 -08:00
amantley
101e67498a
cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property
2017-11-28 14:11:56 -08:00
amantley
d607ca0914
initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server
2017-11-28 11:04:48 -08:00
amantley
522dc3dfb1
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating Character entity fixes branch with the changes in the origin
master
2017-11-22 17:55:39 -08:00
amantley
2e75016021
changes to modelEntity.cpp
2017-11-22 17:53:21 -08:00
amantley
fdf5139a74
everything now works with an atomic start time property. but now I will get rid of this and use current frame instead
2017-11-22 17:52:13 -08:00
amantley
1e5d099b06
changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp
2017-11-21 17:36:01 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
amantley
013d16cee9
this is the change to add a property for the currentframeplaying
2017-11-17 18:37:54 -08:00
amantley
20fd893b47
Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp
2017-11-16 18:38:28 -08:00
amantley
881b22ab15
added update function to modelEntityItem.cpp
2017-11-16 12:41:56 -08:00
amantley
cc43d8115c
In response to bug in the original PR, in RenderModelEntityItem.cpp I made a change in the handling of the boundary cases for the first and last frame properties. Also deleted some extraneous comments.
2017-11-15 17:42:33 -08:00
amantley
3f7a9e9703
all entity animation fixes including the animation play reset
2017-11-10 15:36:57 -08:00
amantley
1a06c6ef11
all entity animation fixes done except play animation
2017-11-10 15:23:17 -08:00
amantley
3ce65ece87
Merge remote-tracking branch 'upstream/master' into character_entity_fixes
...
this is just to synch this branch with the upstream master
2017-11-09 10:38:34 -08:00
amantley
af0304fd6b
preliminary changes for the property fixes
2017-11-09 10:04:12 -08:00
amantley
e13a74213c
this is holder spot to put avatar entity animation code
2017-11-06 17:29:19 -08:00
samcake
d878fac62c
REverse changes
2017-11-06 11:25:02 -08:00
Sam Gateau
45e5d91b9d
Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model
2017-11-04 20:49:55 -07:00
Andrew Meadows
2b06df1c33
call Model::scaleToFit() before update render items
2017-11-02 12:52:46 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Andrew Meadows
29efe53f74
repair debug rendering of collision shapes
2017-10-24 13:23:46 -07:00
Bradley Austin Davis
4f5851f420
Reducing needless render updates
2017-10-23 15:31:25 -07:00
Brad Hefta-Gaub
87294b8e67
Merge pull request #11638 from ZappoMan/fixWireframe
...
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 14:29:01 -07:00
ZappoMan
ef0ff96a44
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 11:46:28 -07:00
Andrew Meadows
c79bf3bc04
cleanup WANT_DETAILED_PROFILING
2017-10-19 14:31:50 -07:00
Andrew Meadows
339edc67c8
ifdef out more per-frame-per-entity profiling
2017-10-16 17:27:53 -07:00
Andrew Meadows
102a1cb36b
ifdef out detailed profiling
2017-10-16 16:02:11 -07:00
Andrew Meadows
fb1c075a12
fix animating entities
2017-10-16 15:55:25 -07:00
Andrew Meadows
23bb8608b1
minor optimizations in updateModelBounds()
2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc
update profiling timers
2017-10-16 11:52:30 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
2017-10-09 13:55:48 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07:00
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
2017-10-04 13:50:35 -07:00
