Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 09:31:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename Mesh api getPos3 to getPos, deprecate but still support getPos3

Browse source
This commit is contained in:
Seth Alves 2018-03-14 10:24:44 -07:00
parent 2487e34ee8
commit 2fd6bc4130
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/graphics/src/graphics/Geometry.h
View file

@ -74,7 +74,7 @@ public:
size_t getNumIndices() const { return _indexBuffer.getNumElements(); } size_t getNumIndices() const { return _indexBuffer.getNumElements(); }
// Access vertex position value // Access vertex position value
const Vec3& getPos3(Index index) const { return _vertexBuffer.get<Vec3>(index); } const Vec3& getPos(Index index) const { return _vertexBuffer.get<Vec3>(index); }
enum Topology { enum Topology {
POINTS = 0, POINTS = 0,

4
libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
View file

@ -21,7 +21,7 @@ int SimpleMeshProxy::getNumVertices() const {
return (int)_mesh->getNumVertices(); return (int)_mesh->getNumVertices();
} }
glm::vec3 SimpleMeshProxy::getPos3(int index) const { glm::vec3 SimpleMeshProxy::getPos(int index) const {
return _mesh->getPos3(index); return _mesh->getPos(index);
} }

4
libraries/model-networking/src/model-networking/SimpleMeshProxy.h
View file

@ -26,8 +26,8 @@ public:
int getNumVertices() const override; int getNumVertices() const override;
glm::vec3 getPos3(int index) const override; glm::vec3 getPos(int index) const override;
glm::vec3 getPos3(int index) const override { return getPos(index); } // deprecated
protected: protected:
const MeshPointer _mesh; const MeshPointer _mesh;

5
libraries/shared/src/RegisteredMetaTypes.h
View file

@ -363,12 +363,13 @@ public:
/**jsdoc /**jsdoc
* Get the position of a vertex in the mesh. * Get the position of a vertex in the mesh.
* @function MeshProxy#getPos3 * @function MeshProxy#getPos
* @param {number} index - Integer index of the mesh vertex. * @param {number} index - Integer index of the mesh vertex.
* @returns {Vec3} Local position of the vertex relative to the mesh. * @returns {Vec3} Local position of the vertex relative to the mesh.
* @deprecated Use the {@link Graphics} API instead. * @deprecated Use the {@link Graphics} API instead.
*/ */
Q_INVOKABLE virtual glm::vec3 getPos3(int index) const = 0; Q_INVOKABLE virtual glm::vec3 getPos(int index) const = 0;
Q_INVOKABLE virtual glm::vec3 getPos3(int index) const { return getPos(index); } // deprecated
}; };
Q_DECLARE_METATYPE(MeshProxy*); Q_DECLARE_METATYPE(MeshProxy*);