Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug

sidestep linux gcc linker? bug

Brad Davis committed 10 years ago

Commit fdbbd702 parents 5b09748 77a49e61 file · +22 −21Browse files

Showing the changes to libraries/render-utils/src/AnimDebugDraw.cpp (1 of 1 file). Show all

Unified · Split

libraries/render-utils/src/AnimDebugDraw.cpp+22−21

 #include "AnimDebugDraw.h"
-struct Vertex {
-    glm::vec3 pos;
-    uint32_t rgba;
-};
 class AnimDebugDrawData {
 public:
+    struct Vertex {
+        glm::vec3 pos;
+        uint32_t rgba;
+    };
     typedef render::Payload<AnimDebugDrawData> Payload;
     typedef Payload::DataPointer Pointer;
     }
     // HACK: add red, green and blue axis at (1,1,1)
-    _animDebugDrawData->_vertexBuffer->resize(sizeof(Vertex) * 6);
+    _animDebugDrawData->_vertexBuffer->resize(sizeof(AnimDebugDrawData::Vertex) * 6);
-    static std::vector<Vertex> vertices({
+    static std::vector<AnimDebugDrawData::Vertex> vertices({
-        Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(255, 0, 0, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(255, 0, 0, 255) },
-        Vertex { glm::vec3(2.0, 1.0f, 1.0f), toRGBA(255, 0, 0, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(2.0, 1.0f, 1.0f), toRGBA(255, 0, 0, 255) },
-        Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(0, 255, 0, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(0, 255, 0, 255) },
-        Vertex { glm::vec3(1.0, 2.0f, 1.0f), toRGBA(0, 255, 0, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(1.0, 2.0f, 1.0f), toRGBA(0, 255, 0, 255) },
-        Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(0, 0, 255, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(1.0, 1.0f, 1.0f), toRGBA(0, 0, 255, 255) },
-        Vertex { glm::vec3(1.0, 1.0f, 2.0f), toRGBA(0, 0, 255, 255) },
+        AnimDebugDrawData::Vertex { glm::vec3(1.0, 1.0f, 2.0f), toRGBA(0, 0, 255, 255) },
     });
     static std::vector<uint16_t> indices({ 0, 1, 2, 3, 4, 5 });
-    _animDebugDrawData->_vertexBuffer->setSubData<Vertex>(0, vertices);
+    _animDebugDrawData->_vertexBuffer->setSubData<AnimDebugDrawData::Vertex>(0, vertices);
     _animDebugDrawData->_indexBuffer->setSubData<uint16_t>(0, indices);
 }
 const int NUM_CIRCLE_SLICES = 24;
-static void addBone(const AnimPose& rootPose, const AnimPose& pose, float radius, Vertex*& v) {
+static void addBone(const AnimPose& rootPose, const AnimPose& pose, float radius, AnimDebugDrawData::Vertex*& v) {
     const float XYZ_AXIS_LENGTH = radius * 4.0f;
 }
 static void addLink(const AnimPose& rootPose, const AnimPose& pose, const AnimPose& parentPose,
-                    float radius, const glm::vec4& colorVec, Vertex*& v) {
+                    float radius, const glm::vec4& colorVec, AnimDebugDrawData::Vertex*& v) {
     uint32_t color = toRGBA(colorVec);
     }
 }
-static void addLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color, Vertex*& v) {
+static void addLine(const glm::vec3& start, const glm::vec3& end, const glm::vec4& color, AnimDebugDrawData::Vertex*& v) {
     uint32_t colorInt = toRGBA(color);
     v->pos = start;
     v->rgba = colorInt;
         numVerts += (int)DebugDraw::getInstance().getRays().size() * VERTICES_PER_RAY;
         // allocate verts!
-        std::vector<Vertex> vertices;
+        std::vector<AnimDebugDrawData::Vertex> vertices;
         vertices.resize(numVerts);
         //Vertex* verts = (Vertex*)data._vertexBuffer->editData();
-        Vertex* v = nullptr;
+        AnimDebugDrawData::Vertex* v = nullptr;
         if (numVerts) {
             v = &vertices[0];
         }
         }
         DebugDraw::getInstance().clearRays();
-        data._vertexBuffer->resize(sizeof(Vertex) * numVerts);
+        data._vertexBuffer->resize(sizeof(AnimDebugDrawData::Vertex) * numVerts);
-        data._vertexBuffer->setSubData<Vertex>(0, vertices);
+        data._vertexBuffer->setSubData<AnimDebugDrawData::Vertex>(0, vertices);
         assert((!numVerts && !v) || (numVerts == (v - &vertices[0])));