Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 05:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

287 commits

Author SHA1 Message Date
Andrew Meadows
82f212bc19 close issue #1602 (particles overlap during collisions) 2014-01-22 13:29:43 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Brad Hefta-Gaub
164e703dec tweaks to JS particle editing api 2014-01-21 20:05:00 -08:00
Brad Hefta-Gaub
eb1e72b838 fix a bug where x was only attribute being copied for vec3s WHT 2014-01-21 16:40:03 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
278ca02595 remove debug code 2014-01-21 14:06:55 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Andrew Meadows
141c20f4ef Fix formatting to abide by compressed K&R style. 2014-01-21 09:26:23 -08:00
Brad Hefta-Gaub
347933f1a5 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/particles/src/ParticleTreeElement.cpp
 2014-01-21 02:15:46 -08:00
Brad Hefta-Gaub
cd0e8e742c particle edit checkpoint 2014-01-21 02:12:31 -08:00
Andrew Meadows
966cd76e2c Adding static friction for easier "catching" of particles on paddle hands. 2014-01-20 17:34:24 -08:00
Andrew Meadows
516a590e4f Modifying how the "particle is stopped" logic reads with minimal modification to how it works. 2014-01-20 17:33:09 -08:00
Brad Hefta-Gaub
d831f9df5e first cut at using partial property info in particle edits 2014-01-20 16:34:45 -08:00
Andrew Meadows
1ed57e044a Fixing measure of "old" particles while simplifying the math (faster!). 2014-01-20 13:40:15 -08:00
Andrew Meadows
1eb2f19320 Removing one more usecTimestampNow() call in Particle::update() 2014-01-20 13:34:08 -08:00
Andrew Meadows
79e4b6d691 Removing per-particle calls to usecTimestampNow() which can add up when simulating a lot of particles. 2014-01-20 13:27:19 -08:00
Brad Hefta-Gaub
b4b3720fcf move creatorTokenID management into Particle static members 2014-01-20 12:56:35 -08:00
Andrew Meadows
61e1b25e70 ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase() 2014-01-20 12:43:27 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
Brad Hefta-Gaub
ab9e01ce7f add ParticleID class 2014-01-20 09:11:47 -08:00
Andrew Meadows
d0a53f817a applyHardCollision() now takes a CollisionInfo rather than two vectors ("penetration" and "addedVelocity") 2014-01-17 17:14:57 -08:00
Brad Hefta-Gaub
a7fd1e4565 first cut at having particle JS api return ParticleID types 2014-01-17 16:50:56 -08:00
Andrew Meadows
3750aa902a Cleanup of "soft hand paddle" collision hackery. Still a hack, but more commented and readable. 2014-01-17 16:31:06 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
Brad Hefta-Gaub
43da1edadb more particle work 2014-01-17 11:35:35 -08:00
Andrew Meadows
f08e639cb2 fixes for avatar paddle-hands, plus some hackery for demo 2014-01-17 11:22:50 -08:00
Stephen Birarda
75152abe2c fix unused variable warnings and constructor ordering 2014-01-16 09:52:29 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrew Meadows
221f830b5f Uncommenting particle shift on penetration. 2014-01-15 17:03:07 -08:00
Andrew Meadows
32f3621855 merge upstream work into local repo 2014-01-15 14:13:48 -08:00
Andrew Meadows
09bce076cc All avatars now have disk collision proxies at their hands. 2014-01-15 14:06:31 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Andrew Meadows
b51699bb2f First pass at particle-hand collisions using hacked hand capsules. 2014-01-14 16:25:31 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
a290017746 more type mismatch warning fixes 2014-01-13 00:46:43 -08:00
Brad Hefta-Gaub
550ec8a9c7 changed all fmin to std::min 2014-01-10 21:42:01 -08:00
Brad Hefta-Gaub
ac97f129d3 change interface since its confusing windows compiler 2014-01-10 20:49:08 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Andrew Meadows
c4c0c389ae Temporarily disabling DAMPING and non-unity ELASTICITY during particle-particle collisions 2014-01-10 11:42:23 -08:00
Andrew Meadows
71e5de8420 Adding Particle::_mass and correct elastic collisions between particles 2014-01-10 11:37:01 -08:00
Brad Hefta-Gaub
03794f7218 make casts float match coding standard 2014-01-09 10:07:51 -08:00
Brad Hefta-Gaub
7ce774da70 change particle update to support full script engine 2014-01-05 10:39:58 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Andrew Meadows
6f21592ebd pulling latest upstream changes to local repo 2014-01-03 16:51:21 -08:00
Andrew Meadows
8f94cec746 Fixing build: missed some instances of VOXEL_ELASTICITY. 
Also enforcing C++ style casts.
 2014-01-03 16:49:13 -08:00
Andrew Meadows
d8e48f8cba Pulling latest worklist/hifi into local repo 2014-01-03 16:36:52 -08:00
Andrew Meadows
1882c9e43b Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-03 16:26:17 -08:00
Andrew Meadows
bce39e916a Pulling latest worklist/hifi into local repo 2014-01-03 16:10:21 -08:00
Andrew Meadows
74392a8835 Moved ParticleTreeUpdateArgs into ParticleTreeElement.h 2014-01-03 16:03:42 -08:00
Philip Rosedale
83101d3d11 reduce elasticity to be less than 1 2014-01-03 15:31:16 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Andrew Meadows
f78b7cda6f Merge pull request 1435 into https://github.com/worklist/hifi 'master' 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-02 13:01:45 -08:00
Andrew Meadows
934b0f619b Particles now collide with avatars, but avatars don't react yet. 2014-01-02 09:36:21 -08:00
Andrew Meadows
5843c745cb minor formatting and code standard enforcement to Particle.* 2014-01-02 09:30:14 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
Andrew Meadows
14b88fd141 Changing meaning of "elasticy" in applyHardCollision() to range in [0,1] instead of [1,2] 
Also enforcing C++ style casts as per coding standard.
 2013-12-31 09:49:46 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
ZappoMan
5057517b78 pass scriptable particle on collisions 2013-12-30 16:35:58 -08:00
ZappoMan
cd11545613 change to setScript() since it does more than update 2013-12-30 15:55:46 -08:00
ZappoMan
8e6f924c73 add access to Voxels and Particles inside of collision scripts 2013-12-30 15:48:50 -08:00
ZappoMan
f4b28041fa first cut at running scripts on particle collisions 2013-12-30 14:59:00 -08:00
Philip Rosedale
f4a28850cf Merge remote-tracking branch 'upstream/master' 2013-12-19 23:05:37 -08:00
ZappoMan
98e511a71c removed extra debug messages 2013-12-19 15:16:43 -08:00
Philip Rosedale
6a941a024d Merge remote-tracking branch 'upstream/master' 2013-12-19 15:01:58 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
Philip Rosedale
c0f3ec5b6a merge fix 2013-12-19 10:55:00 -08:00
ZappoMan
864fc10d3a debug cleanup and change to Particle::update() to handle clock skew slightly better 2013-12-19 10:39:42 -08:00
ZappoMan
26366e9fe7 cleanup debug 2013-12-19 10:05:20 -08:00
Philip Rosedale
c287e37691 Reverted key mapping change since Andrzej fixed the underlying problem. 2013-12-19 10:02:43 -08:00
ZappoMan
b48161ae26 cleanup debug 2013-12-19 09:59:36 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
ZappoMan
d430558ea9 fix expectedBytes() mismatch between edit packets and normal packets 2013-12-18 21:08:34 -08:00
ZappoMan
95df772707 make really old 30 seconds not 300 2013-12-18 19:36:34 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
6e2c0032b5 removed dead code 2013-12-18 19:22:15 -08:00
ZappoMan
c6933239d9 fixed comment 2013-12-18 19:21:30 -08:00
ZappoMan
920ef65ccb removed _lastedEdited changed to editedAgo 2013-12-18 19:01:42 -08:00
ZappoMan
c68a226094 removing of created timestamp from wire format, still supports lifetime 2013-12-18 17:43:48 -08:00
ZappoMan
8b1c39a471 more lastUpdated-ectomy 2013-12-18 17:03:53 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
ZappoMan
11a5ff2eb8 added edited times to particles and don't change local tree if particle has not been edited 2013-12-17 12:39:35 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
ZappoMan
8f3997da19 use findSpherePenetration() which fixes target zone detection of particles 2013-12-16 15:03:45 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -08:00
ZappoMan
aaf4ff7dfc added lifetime to particles 2013-12-13 14:30:29 -08:00
ZappoMan
7a4f9cf722 particle to particle collisions 2013-12-13 10:23:37 -08:00
ZappoMan
d5c6c60836 fix crash in collisions 2013-12-12 18:04:27 -08:00
ZappoMan
51f07cad88 removed some debug 2013-12-12 17:56:56 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Andrzej Kapolka
17b2ee6984 Fix for obnoxious C++0x warning in GCC. 2013-12-12 16:46:17 -08:00
ZappoMan
18cbb2d00f particle tree pruning on update 2013-12-12 15:09:30 -08:00
ZappoMan
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
ZappoMan
cd830efdd4 fixed typo 2013-12-12 12:26:12 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -08:00
ZappoMan
bc80862825 removed some debugging 2013-12-12 11:07:13 -08:00
ZappoMan
e1b3b9d967 fixed indent, added some damping debugging 2013-12-12 10:59:28 -08:00
ZappoMan
5ec8de1bf3 have ParticleEditHandle update local tree as well 2013-12-12 10:41:55 -08:00
ZappoMan
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26:55 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
ZappoMan
1225e20fad fix flashy particles caused by server deleting octree elements while particles still exist 2013-12-11 09:54:30 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
ZappoMan
542019a491 add script to the particle wire and disk format 2013-12-10 15:28:59 -08:00
ZappoMan
d65479406c only render particle elements that are in view 2013-12-10 14:22:52 -08:00
ZappoMan
ba9a113720 added gravity, damping, and shouldDie behavior to particles 2013-12-10 12:53:42 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
ZappoMan
99e3a58a68 more work on update 2013-12-09 16:33:12 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
ebb0a792a3 particle scripting 2013-12-06 15:57:11 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
ZappoMan
426c89b639 First cut at new ParticleEditPacketSender class 2013-12-05 18:00:56 -08:00
ZappoMan
072ced0185 first cut at PACKET_TYPE_PARTICLE_ADD implementation 2013-12-05 15:38:36 -08:00
ZappoMan
86ffbc3d33 first pass at adding actual particles to the ParticleTree 2013-12-05 12:07:52 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
3ca7dc7196 added CMakeLists.txt 2013-12-04 20:19:49 -08:00
ZappoMan
2119f0da7d Merge branch 'master' of https://github.com/worklist/hifi into more_on_particle_server 
Conflicts:
	libraries/particle-server/CMakeLists.txt
	libraries/particle-server/src/ParticleServer.h
	libraries/particles/src/ParticleTree.cpp
 2013-12-04 13:27:44 -08:00
ZappoMan
37466251d4 added some scripts, latest particle server work 2013-12-04 13:25:50 -08:00
ZappoMan
c24e32ce06 basic ParticleTree and ParticleTreeElement classes 2013-12-04 12:32:46 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00