Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 03:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

1470 commits

Author SHA1 Message Date
Eric Levin
8a191a661d adding flag for points changed 2015-06-01 09:35:32 -07:00
Eric Levin
9ca5310c21 cleaned up another qDebugging line 2015-05-31 15:33:51 -07:00
Eric Levin
115bf3dd25 cleaned up logging and testing code. 2015-05-31 14:52:44 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
f955cb45b2 keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:14:54 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Eric Levin
7d5dd278a1 adding unpacking 2015-05-29 16:54:40 -07:00
Philip Rosedale
6b9f6ff7bb Merge pull request #4994 from AndrewMeadows/isentropic 
compute correct deltaTime for extrapolation of moving entity and other fixes
 2015-05-29 16:07:10 -07:00
Seth Alves
a96520ca74 set up EntityItemPropertiesFromScript to either ignore or honor read-only properties 2015-05-29 13:43:18 -07:00
Seth Alves
1a26421414 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-29 13:04:45 -07:00
Andrew Meadows
8177512432 send all TerseUpdate properties when one changes 2015-05-29 11:35:50 -07:00
ZappoMan
7ec44dfc88 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 11:23:31 -07:00
ZappoMan
94f6e8cebd Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 11:23:22 -07:00
ZappoMan
dc62052a3c more hacking on models 2015-05-29 11:07:25 -07:00
Andrew Meadows
f049dc37fc Merge pull request #4992 from howard-stearns/preload-collision-sounds 
Preload collision sounds
 2015-05-29 09:51:41 -07:00
Seth Alves
9f4fff3588 don't need convertScriptValue(QScriptEngine* e, QDateTime v) 2015-05-29 09:33:29 -07:00
Eric Levin
f573645291 line entity width translating 2015-05-29 09:24:00 -07:00
Atlante45
ab13bc41a4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:53:17 +02:00
ZappoMan
78c701a89d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 08:40:46 -07:00
Atlante45
0384b74479 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:37:53 +02:00
Atlante45
f07f9ac0c5 Expand setDimensions check to negative values 2015-05-29 17:04:39 +02:00
Seth Alves
0cf9afd8ec attempt to save _created as an iso date in utc 2015-05-28 21:21:57 -07:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Seth Alves
6b8b930839 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 16:16:13 -07:00
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Seth Alves
131827a82b libraries/entities doesn't need polyvox, only libraries/entities-renderer 2015-05-28 14:27:49 -07:00
Andrew Meadows
7be16da1a8 compute correct time-of-flight for extrapolation 2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675 line working from array of points 2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 14:15:51 -07:00
Brad Hefta-Gaub
1c3398f27e Merge pull request #4991 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
ZappoMan
f736ce714f fix build buster 2015-05-28 13:33:57 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
Andrew Meadows
b7e3461e1a restore _created magic 2015-05-28 12:21:38 -07:00
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Eric Levin
8886e93d5f changed qVector to qVectorVec3 2015-05-28 11:26:41 -07:00
Seth Alves
92817d9302 created-time is a property so it can be persisted to and retrieved from json saves 2015-05-28 10:59:27 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Seth Alves
7547ef6ea4 code review 2015-05-28 10:29:07 -07:00
ZappoMan
806ee88f1f place burden of adding/removing to/from scene on entity 2015-05-28 09:43:36 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
Seth Alves
a91a7942a4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 06:59:39 -07:00
Andrew Meadows
c32ff497e8 Merge pull request #4982 from howard-stearns/unowned-object-sounds 
Unowned object sounds
 2015-05-27 21:07:49 -07:00
ZappoMan
5ad9efbee4 allow entities to tell us if they support proper scene rendering 2015-05-27 20:42:53 -07:00
ZappoMan
63c19f7c11 fix build buster from bad merge 2015-05-27 20:19:59 -07:00
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
Seth Alves
4961c10e17 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 19:05:01 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -07:00
Howard Stearns
bbc04f3b03 Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds 2015-05-27 18:08:37 -07:00
Andrew Meadows
0a0eba8277 merge 2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d fix grab glitches and failure to own simulation 2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix 
Particle entities should avoid resetting simulation when setMaxParticles is called
 2015-05-27 17:44:44 -07:00
Howard Stearns
4fffe05b63 Play still sound for still objects and those just created in a script. 2015-05-27 16:25:11 -07:00
Eric Levin
385c9be75f using vec of points 2015-05-27 15:35:06 -07:00
Seth Alves
c3c701f807 polyvox no longer has a color 2015-05-27 15:23:01 -07:00
Seth Alves
8cb5717b86 formatting, cleanups 2015-05-27 15:16:15 -07:00
Seth Alves
5cc038e1c6 polyvox no longer has a color 2015-05-27 15:12:26 -07:00
Seth Alves
ded79609de back out unrelated change 2015-05-27 15:10:27 -07:00
Eric Levin
8edc883e4d adding serialization for Qvector 2015-05-27 13:47:47 -07:00
Eric Levin
62539719df line width added as property to line entities 2015-05-27 13:31:47 -07:00
ZappoMan
1a7c6eb316 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 10:41:01 -07:00
Seth Alves
6fd38fabe4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 10:06:53 -07:00
Seth Alves
3af916e27e use enum for polyvox surface style 2015-05-27 09:32:10 -07:00
Brad Hefta-Gaub
afb09e81a6 Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts 
Entity events in normal scripts
 2015-05-27 09:24:50 -07:00
Seth Alves
f310da9cd3 adapting to entitypointer merge 2015-05-27 08:59:44 -07:00
Seth Alves
b02e452b19 adapting to entitypointer merge 2015-05-27 08:58:03 -07:00
Seth Alves
c1f75506ae adapting to entitypointer merge 2015-05-27 08:57:22 -07:00
Seth Alves
df795cf296 adapting to entitypointer merge 2015-05-27 08:54:15 -07:00
Seth Alves
c80f2970fd Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 07:37:51 -07:00
Seth Alves
0f81445cee flag for polyvox to select minecraft vs walking-cubes. uppack to unpack 2015-05-27 07:04:44 -07:00
Seth Alves
6930008f74 remove debugging spew 2015-05-26 21:40:50 -07:00
Seth Alves
6b5020285b set last-edited in properties when changing voxel data 2015-05-26 21:32:33 -07:00
Seth Alves
5acc018bda debugging 2015-05-26 20:58:23 -07:00
Seth Alves
ebae87136f debugging 2015-05-26 20:57:58 -07:00
Eric Levin
4fb5f0796c added props for encoding and decoding 2015-05-26 18:40:15 -07:00
Eric Levin
811f5db419 fixed linker error in lineentityitem.cpp 2015-05-26 18:36:24 -07:00
Eric Levin
dc4196df30 line entities 2015-05-26 18:26:25 -07:00
Seth Alves
cd2b6473ba debugging 2015-05-26 18:21:45 -07:00
Seth Alves
517d4372fa debugging 2015-05-26 16:53:11 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
Seth Alves
cdef502e2e expose setVoxelSphere to js 2015-05-26 14:26:05 -07:00
Seth Alves
1ec384ab4d allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays 2015-05-26 13:43:22 -07:00
Seth Alves
988ecf9d55 send PolyVox voxel dimensions and compressed data over the wire 2015-05-26 13:18:52 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
ZappoMan
c4f96b09a2 sam's feedback on shared pointers in master 2015-05-26 09:55:28 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
5f6978a517 sam's CR feedback, more use of share_ptr<> 2015-05-26 09:41:51 -07:00
ZappoMan
d1520c5502 andrews CR feedback 2015-05-26 09:23:27 -07:00
Seth Alves
727f457f91 hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version 2015-05-25 21:01:20 -07:00
Anthony Thibault
18d683bced Particle entities should avoid resetting simulation when setMaxParticles is called. 
This caused all particles to disappear when a network packet was received.
 2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d Restore blank line for minimum diff. 2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Atlante45
3d7a834356 Ignore new entity dimensions if one of them is 0 2015-05-24 20:20:20 +02:00
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
ZappoMan
bcac50b362 verify that entityitem cleanup is happening correctly 2015-05-22 22:39:41 -07:00
ZappoMan
72ffd01920 more work on smart pointers 2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
76c5bd1ab7 verify that entityitem cleanup is happening correctly 2015-05-22 22:01:25 -07:00
ZappoMan
9fa9942861 more work on smart pointers 2015-05-22 21:45:57 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Seth Alves
6c67d14fbc experimenting with physics 2015-05-22 16:21:09 -07:00
Seth Alves
e702518041 adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet 2015-05-22 16:11:29 -07:00
Seth Alves
ed082800f5 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-22 08:38:22 -07:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
f85cc89946 clean up diff 2015-05-21 18:17:07 -07:00
Seth Alves
478cb40135 draws in the right place, now 2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430 added a volex-volume size member variable. drawing transform still isn't quite right 2015-05-21 16:31:01 -07:00
Seth Alves
fe188f9a43 something draws, now 2015-05-21 10:42:14 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
ZappoMan
ce81d9a817 fix merge issue 2015-05-20 19:30:44 -07:00
ZappoMan
e1c5c5b12e Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-20 18:42:54 -07:00
Seth Alves
d7ccd23b07 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-20 18:08:29 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight 
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
 2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f Update default light cutoff to PI / 2 2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3 polyvox code runs, no rendering yet 2015-05-20 08:44:41 -07:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Atlante45
ede94e4248 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-18 11:39:17 +02:00
Andrew Meadows
180590145d check for NULL before using pointer to EntityItem 2015-05-16 11:12:19 -07:00
Atlante45
4725d5e676 Merge branch 'primitives_batch' into remove_gl_transform 2015-05-16 05:22:12 +02:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Atlante45
21d9ae7cf3 Transform compute + Magic numbers 2015-05-15 21:34:54 +02:00
Atlante45
c13ad83cc4 Rename getCenter by get CenterPosition 2015-05-15 18:34:28 +02:00
Atlante45
e5c3a93e54 Make sure get/set pos/rot/dim are inlined 2015-05-15 17:52:29 +02:00
Atlante45
92d4b08c38 Init _transform with correct values 2015-05-15 17:52:06 +02:00
Atlante45
d0cd18d6c0 Replace entities pos/rot/dim with transform 
Removed _position, _rotation, _dimensions
Added Transform _transform
 2015-05-15 17:35:24 +02:00
Andrew Meadows
53e241fb07 merge upstream/master into andrew/thermonuclear 2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea add restitution and friction Entity properties 2015-05-14 12:36:59 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound 
Entity sound.
 2015-05-13 20:07:44 -07:00
ZappoMan
045c0141e8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 17:09:21 -07:00
Howard Stearns
dc2e923583 Ordering for packets. 2015-05-13 15:51:11 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -07:00
ZappoMan
b4f15304ba standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color 2015-05-13 13:12:47 -07:00
ZappoMan
4fecd33115 use new macros in Line entity 2015-05-13 12:38:11 -07:00
ZappoMan
095b7701d8 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 2015-05-13 12:12:12 -07:00
ZappoMan
f28ca90ac5 clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe 2015-05-13 09:38:49 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Andrew Meadows
7e9e223b3e merge upstream/master into andrew/nova 2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9 bid for simulation ownership 2015-05-12 21:46:52 -07:00
Andrew Meadows
45d4fa91ab add a TODO comment 2015-05-12 21:46:04 -07:00
Andrew Meadows
2165d18c05 don't copy simulatorID from script value 2015-05-12 21:45:36 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
ZappoMan
8d731b15ee some warning fixes 2015-05-12 17:21:59 -07:00
ZappoMan
8169d82141 consolidate COPY_PROPERTY_TO_QSCRIPTVALUE and COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE to be type safe 2015-05-12 17:13:20 -07:00
ZappoMan
67df6e3c62 make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe 2015-05-12 16:24:16 -07:00
ZappoMan
98474376de consolidate READ_ENTITY_PROPERTY() macros into single typesafe version 2015-05-12 15:59:45 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00
ZappoMan
83d212861d make APPEND_ENTITY_PROPERTY type safe 2015-05-12 11:41:04 -07:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
ZappoMan
c81f6dc69c fix particle properties 2015-05-12 11:03:16 -07:00
Seth Alves
38caed00ca Attempt to draw line entity item 2015-05-12 10:25:50 -07:00
Brad Hefta-Gaub
cbaa503934 Merge pull request #4838 from Atlante45/quiet_compiler 
Quiet compiler
 2015-05-12 08:57:57 -07:00
Brad Hefta-Gaub
4d9e413b3f Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements 
Improvements to particle entity.
 2015-05-12 08:40:11 -07:00
Atlante45
00864afe53 Quiet compiler 2015-05-12 17:06:40 +02:00
Seth Alves
4881b0c53c copy box to make a new type of line entity item 2015-05-11 19:25:14 -07:00
Anthony Thibault
e1cbfcd901 Merge branch 'master' into ajt/particle-system-improvements 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224 Particle entity improvements based on code review. 
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
  remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
  particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
 2015-05-11 19:21:33 -07:00
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers 
add sequence number support to NL, don't double send data from AvatarMixer
 2015-05-11 19:23:33 +02:00
Anthony J. Thibault
ede42285b1 Improvements to particle entity. 
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
 2015-05-10 17:13:46 -07:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
Andrew Meadows
289dcb0e7f only set ACTIVATE flag on non-zero velocity 2015-05-08 15:39:45 -07:00
ZappoMan
e8f43c7f4b set default atmosphere properties to match the default atmosphere 2015-05-08 10:03:24 -07:00
Stephen Birarda
305835ea79 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-07 15:38:35 -07:00
Andrew Meadows
1879a67804 cleanup 2015-05-07 14:42:09 -07:00
Philip Rosedale
b7b62c8d42 Merge pull request #4772 from AndrewMeadows/nova 
PhysicsEngine cleanup in preparation for collidable avatars
 2015-05-07 14:33:35 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
Seth Alves
f52747d8c1 re-enable code that ignores old packets 2015-05-07 11:53:57 -07:00
Seth Alves
d52a45b57e Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd fix non-physical kinematic motion 
also can set objects collisionless again
 2015-05-07 11:29:42 -07:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Andrew Meadows
00c6944125 merge 2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c fix for entity-server kinematic simulation 2015-05-06 17:48:10 -07:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Seth Alves
c63b8a93ec oops fix endless loop 2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261 don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership 2015-05-06 15:32:02 -07:00
Seth Alves
86ec12b22c don't increase moving-without-simulator counter unless the thing is moving enough 2015-05-06 14:30:45 -07:00
Andrew Meadows
6e6fec158d split ignore/activation thresholds for updates 2015-05-06 11:47:33 -07:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
Andrew Meadows
e61470517c track all entities added to simulation 2015-05-06 11:01:16 -07:00
Stephen Birarda
5b1514a390 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-06 10:12:17 -07:00
Atlante45
8de5e636bb Bit of cleanup 2015-05-06 17:39:18 +02:00
Seth Alves
4a7fe50084 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4 some debugging on Andrew's refactor 2015-05-05 16:40:10 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
Seth Alves
1cd93b9ec8 pull andrew's branch, add back in visual indicator of an entity being active in bullet 2015-05-05 13:14:22 -07:00
Seth Alves
8aafce6382 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 12:53:28 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Andrew Meadows
25ff9e4b59 fix warning about order of ctor initialization 2015-05-05 10:27:48 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
Andrew Meadows
6be3cc6efb remove debug stuff 2015-05-05 10:18:03 -07:00
Andrew Meadows
d5f4c5a0ef add/delete/cleanup of physical entities works 2015-05-05 10:10:08 -07:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
ZappoMan
3f8c52cdd4 attempt to fix unix build buster 2015-05-04 16:36:38 -07:00
ZappoMan
32ef0c2010 removed some dead code 2015-05-04 15:49:21 -07:00
ZappoMan
403ed6d77b wire up sunlocation from keylight direction 2015-05-04 15:20:16 -07:00
ZappoMan
741323e6c1 wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
ZappoMan
8c47736c3b add skybox mode property 2015-05-04 11:41:03 -07:00
ZappoMan
78f7870cbb more tweaks to atmosphere properties 2015-05-04 11:13:05 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Andrew Meadows
35ed755b13 make EntityItem::getID() const 2015-05-03 09:26:28 -07:00
Philip Rosedale
0f22b9beb8 Merge pull request #4741 from sethalves/box-stacking-1 
move common debugging rendering into a new class
 2015-05-02 00:34:44 -07:00
ZappoMan
7ae5ed1aaf next pass at atmosphere properties 2015-05-01 17:48:09 -07:00
Brad Hefta-Gaub
417810c683 Merge pull request #4744 from huffman/show-zone-boundaries 
Add draw zone boundaries bool
 2015-05-01 17:34:15 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Andrew Meadows
3c9474b736 non-phys kinematic objs move to EntitySimulation 
out of SimpleEntitySimulation
 2015-05-01 13:43:50 -07:00
Ryan Huffman
8ed5284dfa Add drawZoneBoundaries get/set to EntitiesScriptingInterface 2015-05-01 12:52:59 -07:00
Ryan Huffman
51c2a8273e Add drawZoneBoundaries 2015-05-01 12:52:40 -07:00
ZappoMan
2128b7499e first cut at adding atmosphere properties to zones 2015-05-01 12:10:12 -07:00
Seth Alves
6139fc0d73 Merge pull request #4738 from huffman/entity-naming 
Add 'name' property to entities
 2015-05-01 11:58:30 -07:00
Ryan Huffman
c506c36d7c Fix initialized-out-of-order warnings for name property 2015-05-01 11:26:43 -07:00
Andrew Meadows
c2d614b884 remove _movableButStoppedEntities 2015-05-01 11:19:01 -07:00
Seth Alves
3765ace7ef move common debugging rendering into a new class 2015-05-01 11:17:46 -07:00
Andrew Meadows
3031d55c8e merge upstream/master into andrew/nova 2015-05-01 11:03:51 -07:00
Andrew Meadows
b023fe582a make things compile 2015-05-01 10:44:50 -07:00
Andrew Meadows
31ca5b9eef add EntityTree::_pendingDelete for delayed deletes 
for case where EntitySimuation needs time to remove pointers
 2015-05-01 10:43:58 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Ryan Huffman
b49a04c638 Add name property to entities 2015-05-01 08:40:24 -07:00
Andrew Meadows
9f8b266a03 fix some compile problems 2015-04-30 13:56:37 -07:00
Andrew Meadows
195dd1420c DIRTY_PHYSICS_ACTIVATION not DIRTY_PHYSICS_NO_WAKE 
also add separate flag for rotation
and separate flags for linear vs angular velocity
and some combined flag masks for convenience
 2015-04-30 13:17:13 -07:00
Andrew Meadows
c3901939e6 make some things compile after reorganization 2015-04-30 13:02:18 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
Andrew Meadows
9c5f51917a declare EntitySimulation::getEntitiesToDelete() 2015-04-29 16:26:46 -07:00
Andrew Meadows
c0a5753317 PhysicalEntitySimulation sends outgoing packets 2015-04-28 17:12:29 -07:00
Andrew Meadows
2f9306ee77 SimpleEntitySimulation abides to new API 2015-04-28 16:28:03 -07:00
Andrew Meadows
14b6ee608a more PhysicalEntitySimulation implementation 
with changes to API's accordingly (does not compile yet)
 2015-04-28 15:07:37 -07:00
Seth Alves
6f441e3490 if our Node isn't allowed to create entities in this domain, don't try. 2015-04-27 19:07:53 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Seth Alves
26511575c2 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 06:44:59 -07:00
Andrew Meadows
b760a03360 pass arguments by const reference 2015-04-26 15:24:00 -07:00
Seth Alves
d1d4b0f0ee merge from upstream 2015-04-25 12:50:00 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Seth Alves
03706359f5 cleanups 2015-04-24 17:44:52 -07:00
Seth Alves
218393a2b3 rather than keeping track of previous pos/rot sent by server, use a new flag that indicates that the values should be updated in the physics engine, but that the object should not be woken 2015-04-24 17:37:19 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Andrew Meadows
3ecf959b3e removed cached copies of damping and restitution 2015-04-24 14:50:37 -07:00
Seth Alves
fea8d84618 sync 2015-04-24 14:09:10 -07:00
Seth Alves
ad85837b5a sync 2015-04-24 13:44:34 -07:00
Seth Alves
a27f8f3f10 sync 2015-04-24 11:28:44 -07:00
Seth Alves
926694517f sync 2015-04-24 11:07:45 -07:00
Seth Alves
b40e78311b disable hack to notice that the server is sending the same thing repeatedly 2015-04-24 11:00:06 -07:00
Seth Alves
1b84be6e10 attempting to have visual indicator of simulatorID 2015-04-24 10:55:43 -07:00
Seth Alves
c2422c2382 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-24 09:29:26 -07:00
Brad Hefta-Gaub
22ff2ba1b8 Merge pull request #4687 from Atlante45/zone_shape_edit_js 
Zone ShapeType/CompoundShapeURL in edit.js
 2015-04-24 09:08:56 -07:00
Atlante45
a26d9ef353 Fix ShapeType/String conversion 2015-04-24 16:49:18 +02:00
Atlante45
fff8b99d10 Fix keylight color 
Was an integer division producing a float
 2015-04-24 15:31:25 +02:00
Seth Alves
cf0499e671 various physics-related experiments 2015-04-23 21:07:04 -07:00
Andrew Meadows
0daaf20f01 Merge pull request #4675 from sethalves/detect-ballistic 
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
 2015-04-23 14:19:51 -07:00
ZappoMan
5dddca37ca fix default shape of zones 2015-04-23 13:44:39 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Brad Hefta-Gaub
945433be28 Merge pull request #4678 from sethalves/fix-pile-at-origin 
don't pile things up at the origin during a load
 2015-04-23 11:40:46 -07:00
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Seth Alves
c21e06e7a7 don't pile things up at the origin during a load 2015-04-23 10:08:59 -07:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Atlante45
51d99da29f Magic number 2015-04-23 17:50:26 +02:00
Atlante45
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
bda72025af Check mesh extend before going through triangles 2015-04-23 16:40:40 +02:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
15482d6a57 Don't compute shape for zones 2015-04-23 15:21:51 +02:00
Atlante45
fb4d1d3557 Fix compoundShapeURL reseting shapeType 2015-04-23 14:24:20 +02:00
Atlante45
f117941c8d Macro fixing 2015-04-23 13:25:14 +02:00
Atlante45
01f4f34911 Centralize contains standard cases 2015-04-23 13:04:59 +02:00
Atlante45
837a0d3ba8 rename collision model in edit.js 2015-04-23 12:13:52 +02:00
Atlante45
3ebe72f025 Fix read macro 2015-04-23 12:12:42 +02:00
Seth Alves
9e96026c52 move _accelerationNearlyGravityCount and _shouldClaimSimulationOwnership from EntityItem to EntityMotionState 2015-04-22 21:36:36 -07:00
Seth Alves
d51f5a0ae8 remove commented out code 2015-04-22 17:22:37 -07:00
Seth Alves
5a7f8a2f5a git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table 2015-04-22 17:06:21 -07:00
Seth Alves
96b4517e6e when removing something from bullet, attempt to wake up anything that was touching it 2015-04-22 16:05:31 -07:00
Seth Alves
07a848c9ce added bump call in physics engine for when an entity is deleted and may have something resting on top of it 2015-04-22 15:50:39 -07:00
Seth Alves
7781808bea remove debug prints, fix a comment 2015-04-22 15:25:09 -07:00
Seth Alves
3450597d70 remove some debugging prints 2015-04-22 15:03:23 -07:00
Seth Alves
92ceff1a03 clean up EntityItem constructors 2015-04-22 14:53:23 -07:00
Seth Alves
cd3ee39fcc experimenting 2015-04-22 13:42:04 -07:00
ZappoMan
fb4e334c70 implement volume priority for zones 2015-04-22 12:38:34 -07:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
7f3be9c89b Add shapeType/compoundShapeURL to ZoneEntities 2015-04-22 21:14:10 +02:00
Atlante45
b446644549 Rename CollisionModelURL handle 2015-04-22 21:03:56 +02:00
Atlante45
8db9f80779 Reimplements "contains" for sphere and particles 2015-04-22 21:03:55 +02:00
Atlante45
dbf40afa47 Remove deprecated "*InDomainUnit" getter/setter 2015-04-22 21:03:55 +02:00
Seth Alves
3f705f3172 keep track of the number of simulation steps each entity has been accelerated at nearly its gravity. if we get 4 in a row, start sending acceleration equal to gravity to the entity server, so it will include gravity in its estimates 2015-04-22 10:39:13 -07:00
Seth Alves
e334c456ea add a place to keep track of the number of simulation steps where acceleration was close to gravity for a given Entity 2015-04-22 10:13:13 -07:00
ZappoMan
19386d5a5d Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-04-22 09:35:08 -07:00
Seth Alves
cde64893af coding standard 2015-04-21 18:36:06 -07:00
ZappoMan
486ab044a0 use piggyback properties to save on property bit space 2015-04-21 15:16:46 -07:00
ZappoMan
4ce451f984 wire up zone rendering again 2015-04-21 14:55:45 -07:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
ZappoMan
8ce4cb628a another attempt at zones starting from box 2015-04-20 18:18:01 -07:00
ZappoMan
a9c2a6e048 another attempt at zones starting from box 2015-04-20 18:17:21 -07:00
Seth Alves
c49e2c1804 cleanups, diff minimization 2015-04-20 16:52:29 -07:00
Seth Alves
4a5631fca6 cleanups, diff minimization 2015-04-20 16:51:28 -07:00
Seth Alves
6107682658 handle ignoring simulation data echoed back to us differently 2015-04-20 16:36:56 -07:00
Seth Alves
d6c8bd94cf clean up some debugging prints 2015-04-20 15:59:33 -07:00
Seth Alves
56b005a872 packets should be ignore if they contain local nodeID, not if local entity contains nodeID 2015-04-20 12:19:36 -07:00
Seth Alves
08d300afcd use a flag to indicate that simulation ownership should be grabbed 2015-04-20 11:49:10 -07:00
Seth Alves
adfc82e169 remove commented-out code 2015-04-17 15:10:34 -07:00
Seth Alves
dac57c44da if measured acceleration is close to zero, send zero to entity server, else send gravity 2015-04-17 15:05:47 -07:00
Seth Alves
d90dec066c if an entity has no simulatorID, pull it out of list of entities with simulatorIDs 2015-04-17 11:12:13 -07:00
Seth Alves
32ced31f60 adjust logic related to claiming and releasing simulation ownership during scripted changes to entities 2015-04-17 10:57:00 -07:00
Seth Alves
3da2d1680d fix code that causes scripted changes to physics-related entity properties to claim simulation ownership 2015-04-17 10:41:11 -07:00
Seth Alves
deec577db6 if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race 2015-04-17 10:21:52 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -07:00
Seth Alves
f77038c52d when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up 2015-04-17 09:37:48 -07:00
Seth Alves
f48f9caea4 cut back on debuging prints 2015-04-16 16:18:13 -07:00
Seth Alves
1484d6e37f fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version 2015-04-16 16:10:01 -07:00
Seth Alves
3b2a15f76a more debugging 2015-04-16 15:52:48 -07:00
Seth Alves
ea8dcfa5b5 read UUIDs as UUIDs rather than as strings. more debugging prints 2015-04-16 15:33:43 -07:00
Seth Alves
d7881f1891 adjust logic for releasing ownership of simulation 2015-04-16 15:15:28 -07:00
Seth Alves
d7059d8f2d add code for uuids in wire protocol. some debugging prints 2015-04-16 14:46:38 -07:00
Andrew Meadows
94c6053d52 fix formatting 2015-04-16 12:15:03 -07:00
Seth Alves
b30b9a0a30 don't update _simulatorIDChangedTime unless the value is different than the current one. if a script changes an entity, attempt to claim ownership 2015-04-16 12:03:34 -07:00
Seth Alves
df37b853f7 setup test of lockout-period oafter simulator-owner-id change 2015-04-16 08:57:57 -07:00
Seth Alves
6c4d232ad9 respond to code review 2015-04-15 16:08:15 -07:00
Seth Alves
e3a90b80a4 fix typo in comment 2015-04-15 16:04:18 -07:00
Seth Alves
62b59b7ccc remove uneeded debug print 2015-04-15 11:02:12 -07:00
Seth Alves
afca5440f0 entity-server will automatically clear simulation-owner ID if it doesn't get an update for 2 seconds 2015-04-15 10:58:56 -07:00
Seth Alves
e5db2380bf Merge branch 'bispinor' of github.com:AndrewMeadows/hifi into acceleration-and-owner-in-wire-protocol 2015-04-14 15:44:59 -07:00
Seth Alves
2a87eb9ce1 pull from andrew's branch 2015-04-14 15:44:53 -07:00
Andrew Meadows
aec42cf2dc enforce ShapeType agreement for ModeEntityItem 2015-04-14 15:39:49 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Seth Alves
3cf31ff701 fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates 2015-04-14 13:32:02 -07:00
Seth Alves
b5bfbba759 only set simulationID on scripted entity creation if the entity has velocity or rotation 2015-04-14 10:17:54 -07:00
Seth Alves
d330319ed9 when a script creates and object, set the local Node as the simulation owner 2015-04-14 09:56:39 -07:00
Seth Alves
f7c0637952 oops 2015-04-13 16:51:05 -07:00
Seth Alves
cf6259c5d7 turn down debugging 2015-04-13 16:41:38 -07:00
Seth Alves
a30e807051 get rid of unneeded updateSimulatorID, set changed simulator id in properties so it gets included in outgoing packet 2015-04-13 16:20:30 -07:00
Seth Alves
396f6b1987 mess with debugging prints 2015-04-13 15:22:54 -07:00
Seth Alves
9c2fec36fd adjust debugging, try a different DIRTY flag 2015-04-13 12:52:31 -07:00
Seth Alves
f42a43e180 cause changes to _simulatorID to be broadcast 2015-04-13 12:39:40 -07:00
Seth Alves
f44f823649 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-13 10:45:07 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Seth Alves
b472edbebb remove debug print for something that no longer exists 2015-04-09 09:26:14 -07:00
Atlante45
298a81cea9 Trim entity properties set from JS that are strings 2015-04-09 14:42:26 +02:00
Seth Alves
62ff8bf735 set PROP_LAST_ITEM automatically 2015-04-08 17:07:20 -07:00
Seth Alves
51a0fdf3d4 formatting 2015-04-08 15:43:49 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -07:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays 
Light overlays
 2015-04-06 16:02:44 +02:00
Ryan Huffman
5fd960fb43 Add entity light cutoff/dimensions constraints 2015-04-03 15:32:53 -07:00
Andrew Meadows
abd78fede5 fix: change of dimensions would not update physics 2015-04-03 15:11:57 -07:00
ZappoMan
45ab438339 add logging for delete operations in the server 2015-04-02 16:44:04 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Philip Rosedale
685de8cc7f Merge pull request #4522 from huffman/rename-attribution 
Rename attribution to marketplaceID
 2015-03-30 10:57:28 -07:00
ZappoMan
a765b4c8a5 fix to preload getting called when you change a script 2015-03-27 18:56:55 -07:00
Ryan Huffman
81cb1e98ba Rename attribution to marketplaceID 2015-03-27 13:35:58 -07:00
Seth Alves
212f564131 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-26 13:08:44 -07:00
Seth Alves
a3a54e8d7d style 2015-03-25 15:21:36 -07:00
Seth Alves
dccedeadff diff minimization 2015-03-24 16:59:12 -07:00
Seth Alves
2f47f7c7ba diff minimization 2015-03-24 16:51:42 -07:00
Seth Alves
8d2c942509 diff minimization 2015-03-24 16:38:11 -07:00
Seth Alves
1eeb2e89f8 remove some debug spam 2015-03-24 16:23:51 -07:00
Seth Alves
6e3be26013 attempting to figure out why physics motion object doesn't get updated when collision model url changes 2015-03-24 15:28:21 -07:00
Atlante45
3563efb584 extra ; 2015-03-24 21:52:53 +01:00
Seth Alves
c8ad82917e clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation 2015-03-23 16:54:36 -07:00
ZappoMan
81bf7138a4 also attempt to clean up placement of PROP_ATTRIBUTION in the stream 2015-03-20 13:21:29 -07:00
ZappoMan
ad833b76c8 fix PROP index mismatch 2015-03-20 11:43:01 -07:00
Atlante45
0a3d936427 Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-20 17:28:32 +01:00
Atlante45
63c51673de Move PROP_COLLISION_MODEL_URL to the right spot 2015-03-20 17:28:00 +01:00
Atlante45
cbef6e546f Fix emun placement 2015-03-19 17:25:53 +01:00
Atlante45
d3ae7cf5cf Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-19 16:25:26 +01:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Andrew Meadows
517b2648ca Merge pull request #4465 from sethalves/avatars-can-collide 
One convex hull shape for models that provide decomposition data.
 2015-03-18 12:52:52 -07:00
Atlante45
8b5ade10b8 Initial add of the Attribution property 2015-03-18 18:57:05 +01:00
Seth Alves
906f082a2a Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-18 09:11:35 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Seth Alves
2dd75fef2c remove some unneeded Q_OBJECT macros, diff minimization 2015-03-17 19:12:26 -07:00
Seth Alves
f9be7dda36 bump shape stuff from ModelEntityItem down to RenderableModelEntityItem 2015-03-17 18:55:13 -07:00
Seth Alves
3a126d4840 ModelEntityItem doesn't need to be a QObject 2015-03-17 16:15:55 -07:00
Seth Alves
42122a0bee EntityItem doesn't need to be a QObject 2015-03-17 15:56:58 -07:00
Seth Alves
5475e76516 merge from upstream 2015-03-17 14:16:00 -07:00
Seth Alves
069c358aa3 Work around a deadlock: 
thread 15 locks Octree
thread 1 blocks waiting for Octree lock
thread 15 tries to pass a message to thread 1 with QMetaObject::invokeMethod, and hangs

thread 15 is blocked on qt message passing to thread 1
  ResourceCache::getResource                       libraries/networking/src/ResourceCache.cpp:57
  GeometryCache::getGeometry                       libraries/render-utils/src/GeometryCache.cpp:1774
  ModelEntityItem::isReadyToComputeShape           libraries/entities/src/ModelEntityItem.cpp:431
  PhysicsEngine::addEntityInternal                 libraries/physics/src/PhysicsEngine.cpp:67
  EntitySimulation::addEntity                      libraries/entities/src/EntitySimulation.cpp:129
  EntityTree::postAddEntity                        libraries/entities/src/EntityTree.cpp:91
        ^ locks simulation
  EntityTreeElement::readElementDataFromBuffer     libraries/entities/src/EntityTreeElement.cpp:773
  Octree::readElementData                          libraries/octree/src/Octree.cpp:301
  Octree::readElementData                          libraries/octree/src/Octree.cpp:354
  ...
  Octree::readBitstreamToTree                      libraries/octree/src/Octree.cpp:439
  OctreeRenderer::processDatagram                  libraries/octree/src/OctreeRenderer.cpp:136
        ^ lockForWrite Octree::_lock
  OctreePacketProcessor::processPacket             interface/src/octree/OctreePacketProcessor.cpp:91
  ReceivedPacketProcessor::process                 libraries/networking/src/ReceivedPacketProcessor.cpp:51

thread 1 is blocked on lockForWrite of Octree::_lock
  Octree::lockForWrite                             libraries/octree/src/Octree.h:292
  EntityTree::update                               libraries/entities/src/EntityTree.cpp:668
        ^ lockForWrite on Octree:_lock
  EntityTreeRenderer::update                       libraries/entities-renderer/src/EntityTreeRenderer.cpp:258
  Application::update                              interface/src/Application.cpp:2189
        ^ calls _physicsEngine.stepSimulation() before this
  Application::idle                                interface/src/Application.cpp:1535
  timer
 2015-03-17 11:38:42 -07:00
Clément Brisset
9acc4a1a8f Merge pull request #4457 from ZappoMan/quietLogs 
dont report deleteEntity warnings in client for delete messages coming back from server
 2015-03-17 15:42:20 +01:00
Seth Alves
b76103edb0 clean up debugging spew 2015-03-16 16:44:29 -07:00
Seth Alves
bed37ef49a incorporate code review feedback 2015-03-16 13:57:22 -07:00
Seth Alves
c90ca4b425 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-16 12:13:26 -07:00
Seth Alves
fe658c0ed0 diff minimization 2015-03-16 12:13:16 -07:00
Seth Alves
5bc2d88ea6 diff minimization 2015-03-16 12:11:41 -07:00
Seth Alves
999324bcaf remove unused code 2015-03-16 12:06:27 -07:00
Seth Alves
2d4a95c634 move to-map recurse operator class to its own file 2015-03-16 11:54:50 -07:00
Seth Alves
109271de3d remove unused constant 2015-03-16 11:54:06 -07:00
Seth Alves
ecb958687d don't crash if we encounter an unknown shape type 2015-03-16 11:53:47 -07:00
Andrew Meadows
fa27b76183 Merge pull request #4442 from Atlante45/edit_entities_box_selection 
editEntities - select all in/touching box
 2015-03-16 11:33:35 -07:00
Seth Alves
08cb13640c debugging spew 2015-03-16 11:22:42 -07:00
ZappoMan
7ddd54b782 dont report deleteEntity warnings in client for delete messages coming back from server 2015-03-16 11:11:07 -07:00
Seth Alves
32c79f6172 bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code 2015-03-16 09:17:32 -07:00
Atlante45
c6167f6893 CR 2015-03-16 14:35:17 +01:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Seth Alves
bd85179d82 suppress a compiler warning 2015-03-15 08:24:59 -07:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Seth Alves
250567e315 formatting, diff minimization 2015-03-14 12:09:23 -07:00
Seth Alves
6b49b0ed7d formatting 2015-03-14 11:58:53 -07:00
Seth Alves
a58f0fe76e remove cruft, formatting 2015-03-14 11:57:08 -07:00
Seth Alves
b815c365eb formatting 2015-03-13 18:57:27 -07:00
Seth Alves
f7f75cabf4 formatting 2015-03-13 18:49:48 -07:00
Seth Alves
0cfc48ab43 don't copy hull points 2015-03-13 18:05:02 -07:00
Seth Alves
50798398ff merge from upstream 2015-03-13 18:04:55 -07:00
Seth Alves
43dbd64f4a fix obj reader 2015-03-13 17:31:52 -07:00
Seth Alves
2368e6e5b7 collision with a hull sort of works. there is a new memory corruption problem 2015-03-13 15:41:57 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Seth Alves
89b58e2681 trying to get loaded callback for model hooked up to PhysicsEngine 2015-03-13 09:11:15 -07:00
Atlante45
29300e0ae0 Added findEntitiesInBox to JS API 2015-03-13 13:55:26 +01:00
Atlante45
7911974946 Added findEntities for AAbox 2015-03-13 13:55:26 +01:00
Seth Alves
a945421d9d still trying to make PhysicsEngine::addEntityInternal be async 2015-03-12 16:38:55 -07:00
Seth Alves
4b1fc4fa10 merge from upstream 2015-03-12 15:59:37 -07:00
Seth Alves
2cf0e1ab25 break PhysicsEngine::addEntityInternal in half, making the 2nd part asynch. This is to allow a ModelEntityItem time to download its collision hull before the 2nd part runs 2015-03-12 15:58:09 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Seth Alves
c9eacd2197 remove unneeded debug print 2015-03-12 11:37:53 -07:00
Seth Alves
6903904267 formatting 2015-03-12 11:31:57 -07:00
Seth Alves
e66ac7f982 formatting 2015-03-12 11:29:47 -07:00
Seth Alves
4aa7b0eb0f provide defaults for anything entity properties read from a map 2015-03-12 11:19:47 -07:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Seth Alves
ac882f86e2 backup code is now aware of possible file extension differences 2015-03-12 09:13:53 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
bf1cb951a3 move PhysicsEntity so that ModelEntityItem can initiate a model download 2015-03-11 18:34:27 -07:00
Seth Alves
918cfa8b4e Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 14:36:25 -07:00
Seth Alves
3a3e723f4e trying to figureo out where to download hull models 2015-03-11 14:26:30 -07:00
Seth Alves
20a22ff42c Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-11 07:17:19 -07:00
Seth Alves
1c73f50dbc started to hook up geometry downloader to ShapeInfo 2015-03-11 07:17:13 -07:00
Seth Alves
844085b514 started on hull collisions 2015-03-10 15:30:08 -07:00
Andrew Meadows
503afc8c73 erase deleted entities from pending sort list 2015-03-10 14:26:19 -07:00
Seth Alves
291f239727 if we read an entity with no id, create a random one for it 2015-03-10 11:55:20 -07:00
Seth Alves
088e23ad54 saving and loading largely works. still some rough edges 2015-03-10 11:31:48 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Seth Alves
2076de9153 started on reading entities from json file 2015-03-10 10:12:29 -07:00
Seth Alves
d0bbac2eb6 json writer sort of works. started on reader 2015-03-09 17:55:58 -07:00
Seth Alves
c947f3b62c use meters in wire-protocol for versions greater than VERSION_ENTITIES_USE_METERS_AND_RADIANS 2015-03-09 14:06:59 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
81dc7cb8cf started on code to persist entities to file as json rather than in the wire protocol 2015-03-09 13:38:18 -07:00
Andrew Meadows
e418872f7b namechanges: setFooInMeters() --> setFoo() 
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
 2015-03-09 09:56:15 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Jason
0fd9540bc3 Sync to upstream 
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
 2015-03-07 21:40:06 -08:00
Seth Alves
96d94e1b09 collision model url 2015-03-07 20:31:04 -08:00
Seth Alves
58bd8a5c65 collision model url 2015-03-07 20:30:29 -08:00
Seth Alves
bcfd1d8a89 collisionModelURL property 2015-03-07 20:27:20 -08:00
Seth Alves
630b5dd03b collisionModelURL property 2015-03-07 20:27:02 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Seth Alves
b96e455b72 uninitialized variable 2015-03-07 11:27:27 -08:00
Andrew Meadows
f5352333f0 entities use radians per second for angular velocity 2015-03-06 16:42:06 -08:00
Jason
7a5669f14e Interview project updates. 
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project.  Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
 2015-03-06 15:52:21 -08:00
Andrew Meadows
95c7bcb5f8 whoops -- remove last *InTreeUnits() calls 2015-03-06 15:34:35 -08:00
Andrew Meadows
c4dafc74ad whoops, remove last bestFitBoundsInMeters() call 2015-03-06 15:33:15 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c committing some temp debug stuff to help git diff 
(will remove this stuff later)
 2015-03-05 18:06:08 -08:00
Ryan Huffman
2c68d56059 Update Entity::sendEntities to return new entity ids 2015-03-05 12:34:05 -08:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Andrew Meadows
59a70b5b5f remove cruft and fix default entity dimensions 2015-03-04 17:32:46 -08:00
ZappoMan
e99ffb8307 fix bug in export 2015-03-04 16:29:34 -08:00
Andrew Meadows
d7d25a6509 Octree::findCapsulePenetration() uses meters 2015-03-04 16:16:49 -08:00
Jason
3522357c8c High Fidelity interview project -- Jason Rickwald 
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
 2015-03-04 16:06:06 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
Andrew Meadows
b9cbd1ea6e witch internal EntityItem data to use meters 2015-03-04 09:38:37 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
98e0f235cc Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users 2015-03-02 14:47:26 -08:00
Ryan Huffman
9a302eebed Add Entities.canAdjustLocksChanged 2015-03-02 10:40:29 -08:00
Ryan Huffman
1a3eb68e2d Update lightEntityItem old version handling to be more clear 2015-03-02 09:25:18 -08:00
Andrew Meadows
90b69b1ee0 replace some "InDomainUnits" calls with "InMeters" 2015-03-01 15:58:10 -08:00
Andrew Meadows
c2e78931c6 revert namechange: use compiler find all instances 2015-03-01 15:21:01 -08:00
Andrew Meadows
e1954d3e1d spherical queries into Octree use meters 2015-03-01 15:19:26 -08:00
Ryan Huffman
84691f922c Remove old light color properties 2015-02-27 14:04:56 -08:00
Ryan Huffman
61bc32493f Fix entity version name in LightEntityItem 2015-02-27 13:49:17 -08:00
Ryan Huffman
093e5db90d Update entity light properties to use new model 
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
 2015-02-27 13:42:56 -08:00
Andrew Meadows
7836bb4dcd rayIntersection uses meters instead of tree units 2015-02-26 17:42:17 -08:00
Andrew Meadows
64c28fe925 remove EntityItem::getSize() 2015-02-26 15:36:59 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters() 
progress toward conversion to meters
 2015-02-26 15:16:59 -08:00
Andrew Meadows
93c77d557a EntityTree::findClosestEntity() now takes meters 2015-02-26 14:14:17 -08:00