Olivier Prat
0b6dcb2717
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
2017-12-05 09:18:26 +01: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
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
amantley
5a1d04ee06
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating the branch with the current master
2017-11-20 10:22:46 -08:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
amantley
befa0f8ab5
now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp
2017-11-20 09:11:15 -08:00
ZappoMan
3b77f14f69
fix build error
2017-11-19 15:12:23 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
33d35bbe14
Merge pull request #11770 from AndrewMeadows/sort-and-throttle
...
sort and throttle UpdateRenderables work... when necessary
2017-11-19 11:09:08 -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
ded81fcab0
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
Updating the branch to the latest code
2017-11-16 13:53:17 -08:00
amantley
881b22ab15
added update function to modelEntityItem.cpp
2017-11-16 12:41:56 -08:00
SamGondelman
3274c41aeb
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-15 17:45:45 -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
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
SamGondelman
8730a26d20
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
2017-11-15 14:12:16 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
Andrew Meadows
2f5b7f32c6
only add valid renderables to _renderablesToUpdate
2017-11-14 17:08:12 -08:00
Andrew Meadows
500f381827
collect hard-coded time budgets in one spot
2017-11-14 15:57:17 -08:00
Andrew Meadows
ffe16a754e
another pass through the crucible
2017-11-14 15:57:17 -08:00
Andrew Meadows
f67114a0a8
PrioritySortUtil::Prioritizer doesn't need to be a template
2017-11-14 15:57:17 -08:00
Andrew Meadows
55cc945c78
organize PrioritySortUtil differently
2017-11-14 15:57:17 -08:00
Andrew Meadows
111480f630
fix bad conflict resolution
2017-11-14 15:57:17 -08:00
Andrew Meadows
e93c10b5ee
remove cruft
2017-11-14 15:57:17 -08:00
Andrew Meadows
8707c76a6a
templatize the ViewFrustum-relative sort algorithm
2017-11-14 15:57:17 -08:00
Andrew Meadows
f47185b2f6
remove tabs from indentation
2017-11-14 15:57:17 -08:00
Andrew Meadows
c6bccb3de3
avoid adding null renderables to list
2017-11-14 15:57:17 -08:00
Andrew Meadows
809ff7928e
sort and throttle UpdateRenderables
2017-11-14 15:57:17 -08:00
SamGondelman
60db24f2d3
merge with master
2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
SamGondelman
2c0272f304
(mostly?) fix touch events
2017-11-13 12:58:31 -08:00
amantley
842cddde88
Deleted new members of RenderableModelEntity.h that were not necessary
...
to implement the loop,hold,play properties for an entity animationq
2017-11-13 12:00:32 -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
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -08:00
Olivier Prat
103e036b70
Shadow maps rendered in cascades
2017-11-10 18:30:37 +01:00
Olivier Prat
8b6a2eeb24
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-10 10:19:32 +01: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
Atlante45
8a903c8b12
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-11-07 14:26:25 -08:00
amantley
e13a74213c
this is holder spot to put avatar entity animation code
2017-11-06 17:29:19 -08:00
SamGondelman
7d420f5242
isLeftHand, isRightHand, isMouse
2017-11-06 12:29:21 -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
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
SamGondelman
55ac585cd9
Merge remote-tracking branch 'upstream/master' into ui
2017-11-03 17:32:13 -07:00
SamGondelman
ce58b6c401
trying to fix HUD events, abstracting touch event logic (wip), seth's comments
2017-11-03 17:15:30 -07:00
Olivier Prat
fbcb2924e8
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-03 15:08:15 +01:00
SamGondelman
dd4275430b
fix hover events, working on HUD events
2017-11-02 17:48:37 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Andrew Meadows
2b06df1c33
call Model::scaleToFit() before update render items
2017-11-02 12:52:46 -07:00
Andrew Meadows
490483fde8
call Model::scaleToFit() before update render items
2017-11-02 12:32:51 -07:00
SamGondelman
657a0fb036
Merge remote-tracking branch 'upstream/pointers' into ui
2017-10-31 17:41:14 -07:00
SamGondelman
5a7298f15b
Merge remote-tracking branch 'upstream/master' into pointers
2017-10-31 17:33:52 -07:00
SamGondelman
64665c87b2
replace ids with unsigned ints
2017-10-31 17:07:48 -07:00
SamGondelman
3c779f1528
HUD events WIP, fix entity/overlay hover, no hover for empty renderState
2017-10-31 14:42:31 -07:00
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -07:00
Bradley Austin Davis
55d819d7e3
Merge pull request #11699 from SamGondelman/ui
...
Pointers generate PointerEvents (WIP)
2017-10-31 10:01:15 -07:00
SamGondelman
76eb4c656e
fix multi-touch and keyboard on web entities
2017-10-30 16:41:59 -07:00
Nissim Hadar
349e12c065
Merge branch 'master' into hazeZone
2017-10-30 10:08:35 -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
Nissim Hadar
420b0f321c
Merge branch 'master' into hazeZone
2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b
Refactoring of the haze
2017-10-27 09:08:58 -07:00
Olivier Prat
dc8c75f403
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-27 15:56:40 +02:00
ZappoMan
e5becba4e9
migrate away from updateXXX standardize on setXXX
2017-10-26 20:38:07 -07:00
SamGondelman
f0c15e874c
merge with master
2017-10-26 14:52:17 -07:00
samcake
b9112024b8
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-26 14:27:23 -07:00
SamGondelman
cf34fe3345
laserpointers generate pointerevents
2017-10-26 12:01:09 -07:00
Olivier Prat
186b531be6
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-10-26 15:12:09 +02:00
Olivier Prat
9eed69d7ef
Trying to pin point a zone bug
2017-10-26 15:11:42 +02:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
samcake
5b0bbbb21e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-25 13:14:47 -07:00
Andrew Meadows
2d0b94817c
Merge pull request #11336 from 1P-Cusack/21389_PR2
...
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Sam Gateau
f38fa14a39
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-24 21:00:44 -07:00
Andrew Meadows
29efe53f74
repair debug rendering of collision shapes
2017-10-24 13:23:46 -07:00
LaShonda Hopper
a9fea4c7d3
[WL21389] Minor fix to RenderableShapeEntityItem::doRender (details below).
...
Shape isn't guaranteed to be permanent and thus the triangle count isn't
guaranteed to be the same since inception, so grab it each time.
Changes to be committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
2017-10-24 14:16:24 -04:00
LaShonda Hopper
5b50b362f1
[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).
...
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.
* Moves GeometryCache::_shapes from public to private scope
* Nothing aside from the class should be directly altering this, only querying
* Updated instances of direct referencing which looks to have been limited to prior
testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
* GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
RenderableShapeEntityItem
* Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
* This helps circumvent the issue with library inclusion. entity-render knows about
entity; however, entity doesn't know about entity-renderer; however, GeometryCache
data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
* This callback is set up within Application::init of the Interface as it knows about
both halves of the equation, and the callback needs to be setup prior to any entities
collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
* This should avoid any issues due to subversively setting the type or
incorrectly setting the type as a tangential operation.
* Audited instances of ShapeInfo::setPointCollection and all seemed to be
calling the function immediately after having set the type via
ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
* This type is reserved for the circle which is now treated as a special
type of Cylinder_Y with regard to collision as opposed to a simple hull.
* Fixes the issue where jumping on a circle, at times, would
result in the avatar sliding off towards an edge as if atop a
squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
* Auditing calls showed that majority of places were comparing against ShapeType
* ShapeType::_type is a ShapeType so returning the type explicitly
is more consistent.
* ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
* Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
GeometryCache::buildShapes.
* Also it appears that a Quad shape can't be created within world via the creation menu.
* There's no explicit option at present to create one.
* Trying subvert the Cube/Box creation option to generate one results in an enforced
stubby box as opposed to a quad.
* Given the aforementioned points, entity::Shape::Quad will default to
SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
* Added Todo regarding the shape being unsupported along with a notation to create
a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.
Reviewed-by: Leander Hasty <leander@1stplayable.com>
Changes Committed:
modified: interface/src/Application.cpp
modified: interface/src/Util.cpp
modified: interface/src/Util.h
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/physics/src/ShapeFactory.cpp
modified: libraries/render-utils/src/GeometryCache.cpp
modified: libraries/render-utils/src/GeometryCache.h
modified: libraries/shared/src/ShapeInfo.cpp
modified: libraries/shared/src/ShapeInfo.h
modified: tests/gpu-test/src/TestInstancedShapes.cpp
2017-10-24 14:16:17 -04:00
Olivier Prat
a34db5f26d
Shadows are now cast by the current zone key light (sun)
2017-10-24 11:09:36 +02:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Bradley Austin Davis
4f5851f420
Reducing needless render updates
2017-10-23 15:31:25 -07:00
SamGondelman
9bbb2eb692
austin's comments, send events directly to selected web entity
2017-10-23 10:17:45 -07:00
Sam Gateau
50a3ccdbca
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-21 10:01:07 -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
Brad Hefta-Gaub
d6ad389dab
Merge pull request #11611 from AndrewMeadows/faster-update-renderables
...
Faster renderables update
2017-10-20 13:43:08 -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
Seth Alves
f2cb5d4aff
clean-up concept of puffed queryAACube
2017-10-19 13:19:13 -07:00
Daniela
832e30ad1c
Edited Packet headers.
2017-10-19 19:53:47 +01:00
samcake
b29f276db3
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-18 16:42:30 -07:00
Nissim
a641d6de66
Variable rename.
2017-10-17 09:18:29 -07:00
Sam Gateau
74b02a3e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-16 20:58:11 -07:00
Andrew Meadows
339edc67c8
ifdef out more per-frame-per-entity profiling
2017-10-16 17:27:53 -07:00
Andrew Meadows
1f09c10fb1
comment out more profiling stuff
2017-10-16 16:43:16 -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
SamGondelman
c6b636901a
fewer undesirable couplings
2017-10-16 13:46:23 -07:00
SamGondelman
d274d99411
merge from master
2017-10-16 12:17:37 -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
Nissim
0a5302ce25
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-10-16 11:01:13 -07:00
samcake
a852d5040d
FIxing the zone entity not stacked properly when created
2017-10-13 16:04:48 -07:00
samcake
918e13b2fc
fixing the zone entity not rendering when created or when avatar appears in one
2017-10-13 15:03:23 -07:00
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Nissim Hadar
5bfbaf4860
Renamed HazeMode to ComponentMode.
2017-10-13 11:24:56 -07:00
samcake
8994200d01
Trying to integrate the tool scripts as an app
2017-10-12 17:57:30 -07:00
SamGondelman
cc8ecdc596
put back entity signals for scripts
2017-10-12 17:28:00 -07:00
SamGondelman
0d164363af
cleanup mousePressOffEntity signal
2017-10-12 15:29:29 -07:00
SamGondelman
1a047613bf
fix pointerevents on entities from scripts
2017-10-12 12:31:36 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -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
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
Nissim Hadar
c9be5ea100
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone
2017-10-09 18:01:48 -07:00
Nissim Hadar
71f567f15a
Merge branch 'master' into hazeZone
2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
2017-10-09 13:55:48 -07:00
SamGondelman
873ae9b9d6
model asks for renderUpdate if animating
2017-10-09 13:36:38 -07:00
Bradley Austin Davis
c92588685b
Merge pull request #11533 from SamGondelman/modelMaster
...
Fix model loading for real this time
2017-10-08 10:23:13 -07:00
Nissim Hadar
e02876f1ea
Zone position/direction sent to haze uniform.
2017-10-06 17:24:20 -07:00
Nissim Hadar
320c888ce4
Added checkbox to allow separate control of keylight attenuation.
2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3
Keylight attenuation implemented.
2017-10-05 18:25:02 -07:00
Nissim Hadar
414cae8df7
Implemented haze colours.
2017-10-05 13:29:32 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
Nissim Hadar
794cb961d5
Merge branch 'master' into hazeZone
2017-10-04 23:03:59 -07:00
Nissim Hadar
ad03301df8
WIP - implementing range+altitude mode.
2017-10-04 23:03:21 -07:00
Nissim Hadar
8b72e3044a
WIP - implementing range+altitude mode.
2017-10-04 22:26:53 -07:00
Nissim Hadar
6dcd8b7b57
Haze Range works.
2017-10-04 21:47:20 -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
SamGondelman
a5f5f9fc5d
try to improve performance
2017-10-04 12:05:13 -07:00
Nissim Hadar
2ce86ebfae
WIP - working on byte order in server messages.
2017-10-04 11:56:35 -07:00
