Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 249 vs 253 for /trunk/Source Code/Geometry/Shapes/Headers/SubMesh.h

Diff revisions: vs.
  @@ -42,7 +42,6 @@
42 42 #include "Hardware/Video/Buffers/VertexBufferObject/Headers/VertexBufferObject.h"
43 43
44 44 class Mesh;
45 - struct aiScene;
46 45 class SubMesh : public Object3D {
47 46 public:
48 47 SubMesh(const std::string& name, ObjectFlag flag = OBJECT_FLAG_NONE) :
  @@ -50,7 +49,8 @@
50 49 _visibleToNetwork(true),
51 50 _render(true),
52 51 _id(0),
53 - _parentMesh(nullptr)
52 + _parentMesh(nullptr),
53 + _parentMeshSGN(nullptr)
54 54 {
55 55 }
56 56
  @@ -68,7 +68,6 @@
68 68 inline Mesh* getParentMesh() {return _parentMesh;}
69 69
70 70 virtual void onDraw(const RenderStage& currentStage);
71 - virtual void preFrameDrawEnd(SceneGraphNode* const sgn) {/*nothing yet*/}
72 71 /// Called from SceneGraph "sceneUpdate"
73 72 virtual void sceneUpdate(const U64 deltaTime, SceneGraphNode* const sgn, SceneState& sceneState);
74 73
  @@ -77,14 +76,17 @@
77 76 protected:
78 77 friend class Mesh;
79 78 inline void setParentMesh(Mesh* const parentMesh) {_parentMesh = parentMesh;}
79 + inline void setParentMeshSGN(SceneGraphNode* const meshSGN) { _parentMeshSGN = meshSGN; }
80 +
80 81 friend class DVDConverter;
81 82 mat4<F32> _sceneRootMatrix;
82 -
83 - private:
83 +
84 + protected:
84 85 bool _visibleToNetwork;
85 86 bool _render;
86 87 U32 _id;
87 88 Mesh* _parentMesh;
89 + SceneGraphNode* _parentMeshSGN;
88 90 };
89 91
90 92 #endif