TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix more compiler warnings

Browse Source
This commit is contained in:
rdb 2014-11-20 00:22:06 +00:00
parent 2ea7149e42
commit 1082e75d87
6 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/collide/collisionFloorMesh.I
View File

@ -56,24 +56,23 @@ add_vertex(const LPoint3 &vert) {
_vertices.push_back(vert); _vertices.push_back(vert);
} }
INLINE const unsigned int CollisionFloorMesh:: INLINE unsigned int CollisionFloorMesh::
get_num_vertices() const { get_num_vertices() const {
return _vertices.size(); return _vertices.size();
} }
INLINE const LPoint3 CollisionFloorMesh:: INLINE const LPoint3 &CollisionFloorMesh::
get_vertex(unsigned int index) const { get_vertex(unsigned int index) const {
return _vertices[index]; return _vertices[index];
} }
INLINE const unsigned int CollisionFloorMesh:: INLINE unsigned int CollisionFloorMesh::
get_num_triangles() const { get_num_triangles() const {
return _triangles.size(); return _triangles.size();
} }
INLINE const LPoint3d CollisionFloorMesh:: INLINE LPoint3i CollisionFloorMesh::
get_triangle(unsigned int index) const { get_triangle(unsigned int index) const {
CollisionFloorMesh::TriangleIndices tri = _triangles[index]; CollisionFloorMesh::TriangleIndices tri = _triangles[index];
return LPoint3d(tri.p1, tri.p2, tri.p3); return LPoint3i(tri.p1, tri.p2, tri.p3);
} }

11
panda/src/collide/collisionFloorMesh.h
View File

@ -41,7 +41,6 @@ public:
PN_stdfloat max_y; PN_stdfloat max_y;
} TriangleIndices; } TriangleIndices;
PUBLISHED: PUBLISHED:
INLINE CollisionFloorMesh(); INLINE CollisionFloorMesh();
@ -49,11 +48,11 @@ PUBLISHED:
INLINE void add_vertex(const LPoint3 &vert); INLINE void add_vertex(const LPoint3 &vert);
void add_triangle(unsigned int pointA, unsigned int pointB, unsigned int pointC); void add_triangle(unsigned int pointA, unsigned int pointB, unsigned int pointC);
INLINE const unsigned int get_num_vertices() const; INLINE unsigned int get_num_vertices() const;
INLINE const LPoint3 get_vertex(unsigned int index) const; INLINE const LPoint3 &get_vertex(unsigned int index) const;
MAKE_SEQ(get_vertices, get_num_vertices, get_vertex); MAKE_SEQ(get_vertices, get_num_vertices, get_vertex);
INLINE const unsigned int get_num_triangles() const; INLINE unsigned int get_num_triangles() const;
INLINE const LPoint3d get_triangle(unsigned int index) const; INLINE LPoint3i get_triangle(unsigned int index) const;
MAKE_SEQ(get_triangles, get_num_triangles, get_triangle); MAKE_SEQ(get_triangles, get_num_triangles, get_triangle);
virtual LPoint3 get_collision_origin() const; virtual LPoint3 get_collision_origin() const;
@ -122,5 +121,3 @@ private:
#include "collisionFloorMesh.I" #include "collisionFloorMesh.I"
#endif #endif

3
panda/src/collide/collisionRay.h
View File

@ -18,8 +18,7 @@
#include "pandabase.h" #include "pandabase.h"
#include "collisionSolid.h" #include "collisionSolid.h"
#include "lensNode.h"
class LensNode;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : CollisionRay // Class : CollisionRay

4
panda/src/collide/collisionTraverser.cxx
View File

@ -235,8 +235,8 @@ get_num_colliders() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
NodePath CollisionTraverser:: NodePath CollisionTraverser::
get_collider(int n) const { get_collider(int n) const {
nassertr(_ordered_colliders.size() == _colliders.size(), NULL); nassertr(_ordered_colliders.size() == _colliders.size(), NodePath());
nassertr(n >= 0 && n < (int)_ordered_colliders.size(), NULL); nassertr(n >= 0 && n < (int)_ordered_colliders.size(), NodePath());
return _ordered_colliders[n]._node_path; return _ordered_colliders[n]._node_path;
} }

2
panda/src/gobj/shader.I
View File

@ -92,7 +92,7 @@ get_text(const ShaderType &type) const {
// error. This doesn't tell you whether or not the // error. This doesn't tell you whether or not the
// shader is supported on the current video card. // shader is supported on the current video card.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const bool Shader:: INLINE bool Shader::
get_error_flag() const { get_error_flag() const {
return _error_flag; return _error_flag;
} }

2
panda/src/gobj/shader.h
View File

@ -98,7 +98,7 @@ PUBLISHED:
INLINE Filename get_filename(const ShaderType &type = ST_none) const; INLINE Filename get_filename(const ShaderType &type = ST_none) const;
INLINE const string &get_text(const ShaderType &type = ST_none) const; INLINE const string &get_text(const ShaderType &type = ST_none) const;
INLINE const bool get_error_flag() const; INLINE bool get_error_flag() const;
INLINE ShaderLanguage get_language() const; INLINE ShaderLanguage get_language() const;
INLINE static ShaderUtilization get_shader_utilization(); INLINE static ShaderUtilization get_shader_utilization();