Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 02:40:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41491 commits 72 branches 59 tags 1.2 GiB
Commit graph

321 commits

Author SHA1 Message Date
ZappoMan
0d9f0f609b first cut at RenderableEnitityItem payload 2015-05-21 16:22:23 -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
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
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -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
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789 
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
 2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -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
72bf160845 Proxies render in Batch 2015-05-18 16:36:16 +02:00
Atlante45
ede94e4248 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-18 11:39:17 +02:00
Atlante45
3436658e45 Add batch to RenderAgrs 2015-05-16 05:42:26 +02:00
Atlante45
4725d5e676 Merge branch 'primitives_batch' into remove_gl_transform 2015-05-16 05:22:12 +02:00
Atlante45
7ff973b94c Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch 2015-05-16 04:36:05 +02:00
Atlante45
feefcbf40f Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform 2015-05-15 20:30:45 +02:00
Sam Cake
97b18fcd52 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 11:29:43 -07:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5 Ask audio injector to delete itself. 
Put in null guards.
Tune parameters (including higher threshold).
 2015-05-15 11:00:28 -07:00
Atlante45
c13ad83cc4 Rename getCenter by get CenterPosition 2015-05-15 18:34:28 +02:00
Atlante45
e0ae8597bc Factor zone code in Model::render 2015-05-15 15:45:31 +02:00
Howard Stearns
5accb4d0d2 Remove debug logging. 2015-05-14 15:12:31 -07:00
Howard Stearns
b5a28730ea Filter out low-penetration continuous contact from all entity collision activity including scripts: 
We don't want sound for these.
   This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
  energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
  COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
  COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
  COLLISION_MINIMUM_VOLUME 0.01 => 0.001
  COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
 2015-05-14 14:41:32 -07:00
Brad Davis
a77816617d Make web entities interactive (via the mouse) if they're not locked. 2015-05-14 01:15:20 -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
Howard Stearns
6ebeb7a22e Another constexpr. 2015-05-13 15:47:47 -07:00
Howard Stearns
76e39fc95b constexpr => const for Windows compiler. 2015-05-13 13:56:10 -07:00
Howard Stearns
1a87ca04da Entity sound. 2015-05-13 13:18:02 -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
Seth Alves
4881b0c53c copy box to make a new type of line entity item 2015-05-11 19:25:14 -07:00
Howard Stearns
51a29bdba6 Put back the script-fix that belongs in this branch. 2015-05-11 11:53:48 -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
ZappoMan
1936f4c114 fix zone:nothing bug 2015-05-08 14:03:58 -07:00
Sam Gateau
deb303838d Cleaning code 2015-05-07 17:15:45 -07:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -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
Atlante45
6d2fe945af Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-06 09:53:57 +02:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 21:33:55 +02:00
Atlante45
46cd1f458b Actually call render on zone entities from tree 2015-05-05 17:20:27 +02:00
ZappoMan
4b9c6728e7 fix issue with skyboxMode getting randomly set 2015-05-04 18:58:35 -07:00
ZappoMan
2c02bfdda5 fix build buster 2015-05-04 16:01:50 -07:00
ZappoMan
3827e961a7 hook sunBrightness to keyLightIntensity 2015-05-04 15:31:50 -07:00
ZappoMan
403ed6d77b wire up sunlocation from keylight direction 2015-05-04 15:20:16 -07:00
ZappoMan
cfe717fe08 only override environment when skyboxMode is atmosphere 2015-05-04 13:53:29 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Atlante45
12fcb35717 Made RenderArgs a default ctor 2015-05-04 17:22:46 +02: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
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Atlante45
a4f03f8b1c Zones use avatar position not view frustum 2015-04-24 22:16:21 +02:00
Atlante45
b776ea8110 Make ::contains() back into a const 2015-04-23 19:15:06 +02:00
Atlante45
83490051d9 Move shape related contains() to ShapeInfo 2015-04-23 18:55:20 +02:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
3a0b5f9d22 Register RenderableZoneEntityItem in EntityTreeRenderer 2015-04-23 15:34:03 +02: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
ZappoMan
8366dd02a0 remove RenderableZoneEntityItem class since zones don't render like other entities 2015-04-21 15:03:04 -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
a9c2a6e048 another attempt at zones starting from box 2015-04-20 18:17:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
074e476797 put entities-renderer logging into its own QLoggingCategory 2015-04-06 16:30:20 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
ZappoMan
d87fe9efff fix typo 2015-04-01 14:47:04 -07:00
ZappoMan
c66db5d8e4 another approach 2015-04-01 14:43:27 -07:00
ZappoMan
d7188bac0b another approach 2015-04-01 14:38:01 -07:00
ZappoMan
aac824fb99 fix crash on shutdown 2015-04-01 13:47:25 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
ZappoMan
31072b2b2e only start one download per url even if still pending 2015-03-30 16:48:41 -07:00
ZappoMan
e2d8d82096 more script caching cleanup 2015-03-30 16:34:04 -07:00
ZappoMan
74d50a9250 more work on improving script caching 2015-03-30 16:21:47 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
ZappoMan
8e7ead2ead fix locking issue in enter/leave entity scripts 2015-03-26 16:05:31 -07:00
Seth Alves
8eedab72b3 remove some unneeded asserts 2015-03-19 09:15:57 -07: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
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -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
Jason
cfcc4679e1 Interview project updates (2). 
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
 2015-03-06 15:57:38 -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
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
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
b9cbd1ea6e witch internal EntityItem data to use meters 2015-03-04 09:38:37 -08:00
Andrew Meadows
7210c7a88b added EntityTree::findEntitiesInMeters() 
progress toward conversion to meters
 2015-02-26 15:16:59 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
Andrew Meadows
8d4ea143ce easy conversions of: InDomainUnits --> InMeters 2015-02-25 14:48:06 -08:00
Andrew Meadows
2f749e3c51 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/entities/src/TextEntityItem.h
 2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed getPosition() --> getPositionInDomainUnits() 
and friends
 2015-02-25 14:35:04 -08:00
ZappoMan
e87df0017a code review feedback 2015-02-25 08:26:54 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
ZappoMan
a8d48e592f removing debug messages 2015-02-23 09:44:18 -08:00
ZappoMan
e5ef61e27e simplifying the change 2015-02-23 09:23:15 -08:00
ZappoMan
d32fc645e8 remove some dead code, added a debugging notes comment 2015-02-23 09:10:15 -08:00
Sam Gateau
ffaea07130 trying to ge the shadow to render correctly 2015-02-23 07:04:14 -08:00
ZappoMan
e3de994c4a more hacking 2015-02-20 18:42:02 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Andrew Meadows
5309fb6a43 remove lock at EntityTreeRenderer::loadEntityScript 2015-01-11 10:44:36 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
eb28efa648 evaluate entity scripts in a sandbox before constructing 2014-12-31 09:58:18 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
32ea38b938 added leaveAllEntities support 2014-12-19 11:33:25 -08:00
ZappoMan
cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-19 10:35:18 -08:00
ZappoMan
7db350eac2 remove calls to glut in entities 2014-12-17 14:07:26 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
Renamed from interface/src/entities/EntityTreeRenderer.cpp (Browse further)