Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 10:47:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some dates and no newline at EOF

Browse source
This commit is contained in:
sabrina-shanman 2019-08-01 13:39:42 -07:00
parent f7c324c017
commit 20fa78e51d
13 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyAvatarHeadTransformNode.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

5
interface/src/avatar/MyAvatarHeadTransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -14,6 +14,7 @@ class MyAvatarHeadTransformNode : public TransformNode {
public: public:
MyAvatarHeadTransformNode() { } MyAvatarHeadTransformNode() { }
Transform getTransform() override; Transform getTransform() override;
QVariantMap toVariantMap() const override;
}; };
#endif // hifi_MyAvatarHeadTransformNode_h #endif // hifi_MyAvatarHeadTransformNode_h

4
interface/src/raypick/CollisionPick.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 7/16/2018 // Created by Sabrina Shanman 2018/07/16
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -460,4 +460,4 @@ Transform CollisionPick::getResultTransform() const {
Transform transform; Transform transform;
transform.setTranslation(_mathPick.transform.getTranslation()); transform.setTranslation(_mathPick.transform.getTranslation());
return transform; return transform;
} }

2
interface/src/raypick/CollisionPick.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 7/11/2018 // Created by Sabrina Shanman 2018/07/11
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

2
interface/src/raypick/MouseTransformNode.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

5
interface/src/raypick/MouseTransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -13,6 +13,7 @@
class MouseTransformNode : public TransformNode { class MouseTransformNode : public TransformNode {
public: public:
Transform getTransform() override; Transform getTransform() override;
QVariantMap toVariantMap() const override;
}; };
#endif // hifi_MouseTransformNode_h #endif // hifi_MouseTransformNode_h

4
libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 9/5/2018 // Created by Sabrina Shanman 2018/09/05
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -10,4 +10,4 @@
template<> template<>
glm::vec3 BaseNestableTransformNode<Avatar>::getActualScale(const std::shared_ptr<Avatar>& nestablePointer) const { glm::vec3 BaseNestableTransformNode<Avatar>::getActualScale(const std::shared_ptr<Avatar>& nestablePointer) const {
return nestablePointer->scaleForChildren(); return nestablePointer->scaleForChildren();
} }

4
libraries/avatars-renderer/src/avatars-renderer/AvatarTransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 9/5/2018 // Created by Sabrina Shanman 2018/09/05
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -17,4 +17,4 @@ public:
AvatarTransformNode(std::weak_ptr<Avatar> spatiallyNestable, int jointIndex) : BaseNestableTransformNode(spatiallyNestable, jointIndex) {}; AvatarTransformNode(std::weak_ptr<Avatar> spatiallyNestable, int jointIndex) : BaseNestableTransformNode(spatiallyNestable, jointIndex) {};
}; };
#endif // hifi_AvatarTransformNode_h #endif // hifi_AvatarTransformNode_h

2
libraries/pointers/src/PickTransformNode.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/22/2018 // Created by Sabrina Shanman 2018/08/22
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

4
libraries/pointers/src/PickTransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/22/2018 // Created by Sabrina Shanman 2018/08/22
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -21,4 +21,4 @@ protected:
unsigned int _uid; unsigned int _uid;
}; };
#endif // hifi_PickTransformNode_h #endif // hifi_PickTransformNode_h

4
libraries/shared/src/NestableTransformNode.cpp
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
@ -11,4 +11,4 @@
template<> template<>
glm::vec3 BaseNestableTransformNode<SpatiallyNestable>::getActualScale(const std::shared_ptr<SpatiallyNestable>& nestablePointer) const { glm::vec3 BaseNestableTransformNode<SpatiallyNestable>::getActualScale(const std::shared_ptr<SpatiallyNestable>& nestablePointer) const {
return nestablePointer->getAbsoluteJointScaleInObjectFrame(_jointIndex); return nestablePointer->getAbsoluteJointScaleInObjectFrame(_jointIndex);
} }

2
libraries/shared/src/NestableTransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.

2
libraries/shared/src/TransformNode.h
View file

@ -1,5 +1,5 @@
// //
// Created by Sabrina Shanman 8/14/2018 // Created by Sabrina Shanman 2018/08/14
// Copyright 2018 High Fidelity, Inc. // Copyright 2018 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.