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

357 commits

Author SHA1 Message Date
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
Seth Alves
de6422683a cleanups, trying to figure out why this doesn't draw 2015-05-20 21:21:39 -07:00
Seth Alves
c3b26b78a0 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-20 18:22:16 -07:00
Seth Alves
138077ede9 hook up mesh renderer 2015-05-20 18:22:07 -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
Brad Hefta-Gaub
39ab2f43bf Merge pull request #4885 from Atlante45/warings 
Quiet warnings
 2015-05-20 14:45:55 -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
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
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Atlante45
cb02ef9277 Remove warnings 2015-05-15 21:35:47 +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
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
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -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
ad5f1214bf Fix error when deleting web item 2015-05-13 11:58:18 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -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
Seth Alves
500bb13cbb c++ 2015-05-12 15:17:27 -07:00
Seth Alves
4e679c7e3a use toGlm for color. remove some commented-out code 2015-05-12 15:08:26 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00
Seth Alves
f647db3bf0 Merge branch 'master' of github.com:highfidelity/hifi into line-entity 2015-05-12 11:36:56 -07:00
Seth Alves
38caed00ca Attempt to draw line entity item 2015-05-12 10:25:50 -07: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
Howard Stearns
51a29bdba6 Put back the script-fix that belongs in this branch. 2015-05-11 11:53:48 -07: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
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
351b92627a Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-07 17:06:41 -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
Seth Alves
d52a45b57e Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 11:30:46 -07:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Seth Alves
867fe18472 put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked 2015-05-07 10:11:36 -07:00
Seth Alves
fe14202f51 add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated 2015-05-07 09:53:39 -07:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02:00
Atlante45
52191f922c Render Sphere/Box zones 2015-05-06 16:57:53 +02:00
Atlante45
6d2fe945af Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-06 09:53:57 +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
Seth Alves
82828f0b93 print when bullet and local octree don't agree on position of an entity 2015-05-05 13:52:10 -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
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
Atlante45
40295ab04e Cleanup RenderableZoneEntityItem 2015-05-05 17:19:42 +02:00
Atlante45
34a39250f2 Add basic render to zones 2015-05-05 15:13:00 +02: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
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
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
Ryan Huffman
51c2a8273e Add drawZoneBoundaries 2015-05-01 12:52:40 -07:00
Seth Alves
bd1f77b8f3 cleanups 2015-05-01 11:35:14 -07:00
Seth Alves
ea1ec0186e stop doing useless multiple inheritance 2015-05-01 11:31:58 -07:00
Seth Alves
b47184de78 oops 2015-05-01 11:21:27 -07:00
Seth Alves
452d78805e oops 2015-05-01 11:20:50 -07:00
Seth Alves
b443ce5d3e oops 2015-05-01 11:20:34 -07:00
Seth Alves
a31e2dc309 oops 2015-05-01 11:18:56 -07:00
Seth Alves
3765ace7ef move common debugging rendering into a new class 2015-05-01 11:17:46 -07:00
Seth Alves
3c24d42d93 improve display of box and model entities when in simulator-id debug mode 2015-04-30 14:17:20 -07:00
Seth Alves
5d5624053f drow boxes as aabox when we are the simulator 2015-04-30 13:15:55 -07:00
Brad Hefta-Gaub
50eecb15b3 Merge pull request #4712 from Atlante45/compound_zones_fix 
Compound zones fix
 2015-04-28 09:48:05 -07:00
Atlante45
fe0bd456e1 Zones now use Models instead of FBXGeometries 2015-04-28 17:07:40 +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
26511575c2 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 06:44:59 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Seth Alves
48ec0c8339 formatting, re-enable code that causes an interface to attempt to claim a moving object with no current simulation-owner 2015-04-25 06:56:19 -07:00
Seth Alves
ac46f84291 cleanups 2015-04-24 18:36:41 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Atlante45
a4f03f8b1c Zones use avatar position not view frustum 2015-04-24 22:16:21 +02:00
Seth Alves
1b84be6e10 attempting to have visual indicator of simulatorID 2015-04-24 10:55:43 -07: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
f494f86ee5 Handle registration point in transforms 2015-04-23 17:48:29 +02:00
Atlante45
99fd590a90 Update compound shape geometry when async get 2015-04-23 16:05:06 +02:00
Atlante45
d18229d52d Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 15:58:57 +02:00
Atlante45
6be0910966 Fix contain for collision hulls 2015-04-23 15:58:18 +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
287d625c52 Added RenderableZoneEntities class 2015-04-22 21:17:12 +02:00
Atlante45
99b3ef0d75 Move contain function to FBXGeometry 2015-04-22 21:17:12 +02:00
Atlante45
9cec256142 Rename collisionModelURL members/methods 2015-04-22 21:16:09 +02:00
Atlante45
f3fcb749df Fix algorithm + add comments 2015-04-22 21:03:55 +02:00
Atlante45
955723acf1 RenderableEntityItem uses collision hull in contains 2015-04-22 21:03:55 +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
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
Andrew Meadows
21d669f2f1 use computed shape type 2015-04-16 12:13:41 -07:00
Andrew Meadows
8623a0606c remove accidentally commited debug code 2015-04-14 15:39:24 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Seth Alves
8479f0d4c1 don't compute shape info until both render and collision geometries are fully loaded 2015-04-13 09:34:38 -07:00
Seth Alves
e8ff727c61 when populating shape-info, give the dimensions of the collision model rather than those of the visual model 2015-04-07 15:47:13 -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
9014397167 try again without macro 2015-04-07 09:59:04 -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
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Seth Alves
abf83bcf9e Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:26:26 -07:00
Seth Alves
997f7251c7 dont need _collisionGeometryScale 2015-04-01 18:23:43 -07:00
Seth Alves
81200bb2a0 save collision hull scaling in model 2015-04-01 17:49:01 -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
Brad Hefta-Gaub
d77333953e Merge pull request #4552 from sethalves/island 
Fix various collision-model related bugs
 2015-03-31 15:47:53 -07:00
Seth Alves
af6ce8fb07 HERE COMES AN S 2015-03-31 14:37:41 -07:00
Seth Alves
95cc8672c0 remove unneeded assert 2015-03-31 14:32:43 -07:00
Seth Alves
347ef3c4e1 use scaling from visual model on collision model rather than using the bounds from the collision model 2015-03-31 14:03:37 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
Seth Alves
c8e623ace7 remove some debugging prints, added some comments 2015-03-31 07:18:20 -07:00
Seth Alves
52fc75a114 merge upstream 2015-03-31 07:18:04 -07:00
Philip Rosedale
4961cf37b6 Merge pull request #4540 from ZappoMan/scriptCaching 
quiet warning flood when scripts are bad
 2015-03-30 21:48:13 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
Seth Alves
acf30782b6 include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script 2015-03-30 17:04:47 -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
Seth Alves
ee7247a5b4 fix a couple of crashes 2015-03-30 15:56:01 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Seth Alves
8a5192c1d9 attempt to handle registration point in hull collisions 2015-03-30 11:22:31 -07:00