Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 15:59:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding avatar info back into ParticleCollisionSystem ctor arguments.

Browse source
This commit is contained in:
Andrew Meadows 2014-01-28 14:43:36 -08:00
parent 714dbf8493
commit e13bc71f39
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/particles/src/ParticleCollisionSystem.cpp
View file

@ -20,8 +20,9 @@
#include "ParticleTree.h" #include "ParticleTree.h"
ParticleCollisionSystem::ParticleCollisionSystem(ParticleEditPacketSender* packetSender, ParticleCollisionSystem::ParticleCollisionSystem(ParticleEditPacketSender* packetSender,
ParticleTree* particles, VoxelTree* voxels, AbstractAudioInterface* audio) { ParticleTree* particles, VoxelTree* voxels, AbstractAudioInterface* audio,
init(packetSender, particles, voxels, audio); AvatarHashMap* avatars) {
init(packetSender, particles, voxels, audio, avatars);
} }
void ParticleCollisionSystem::init(ParticleEditPacketSender* packetSender, void ParticleCollisionSystem::init(ParticleEditPacketSender* packetSender,

4
libraries/particles/src/ParticleCollisionSystem.h
View file

@ -34,8 +34,8 @@ const glm::vec3 NO_ADDED_VELOCITY = glm::vec3(0);
class ParticleCollisionSystem { class ParticleCollisionSystem {
public: public:
ParticleCollisionSystem(ParticleEditPacketSender* packetSender = NULL, ParticleTree* particles = NULL, ParticleCollisionSystem(ParticleEditPacketSender* packetSender = NULL, ParticleTree* particles = NULL,
VoxelTree* voxels = NULL, VoxelTree* voxels = NULL, AbstractAudioInterface* audio = NULL,
AbstractAudioInterface* audio = NULL); AvatarHashMap* avatars = NULL);
void init(ParticleEditPacketSender* packetSender, ParticleTree* particles, VoxelTree* voxels, void init(ParticleEditPacketSender* packetSender, ParticleTree* particles, VoxelTree* voxels,
AbstractAudioInterface* audio = NULL, AvatarHashMap* _avatars = NULL); AbstractAudioInterface* audio = NULL, AvatarHashMap* _avatars = NULL);