Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-06 21:58:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding names to arguments in collisionWithAvatar() declaration

Browse source
This commit is contained in:
Andrew Meadows 2014-04-10 07:53:39 -07:00
parent 4942e93daa
commit f9fb8b46a5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/Avatar.h
View file

@ -64,7 +64,7 @@ enum ScreenTintLayer {
// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found) // Where one's own Avatar begins in the world (will be overwritten if avatar data file is found)
// this is basically in the center of the ground plane. Slightly adjusted. This was asked for by // this is basically in the center of the ground plane. Slightly adjusted. This was asked for by
// Grayson as he's building a street around here for demo dinner 2 // Grayson as he's building a street around here for demo dinner 2
const glm::vec3 START_LOCATION(0.485f * TREE_SCALE, 0.f, 0.5f * TREE_SCALE); const glm::vec3 START_LOCATION(0.485f * TREE_SCALE, 0.0f, 0.5f * TREE_SCALE);
class Texture; class Texture;
@ -156,7 +156,7 @@ public slots:
void updateCollisionFlags(); void updateCollisionFlags();
signals: signals:
void collisionWithAvatar(const QUuid&, const QUuid&, const CollisionInfo&); void collisionWithAvatar(const QUuid& myUUID, const QUuid& theirUUID, const CollisionInfo& collision);
protected: protected:
SkeletonModel _skeletonModel; SkeletonModel _skeletonModel;