Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 330 vs 331 for /trunk/Source Code/AI/PathFinding/NavMeshes/Headers/NavMeshLoader.h

Diff revisions: vs.
  @@ -73,17 +73,17 @@
73 73 _triangleCapacity = _triangleCount = 0;
74 74
75 75 if (del) {
76 - MemoryManager::SAFE_DELETE_ARRAY( _vertices );
76 + MemoryManager::DELETE_ARRAY( _vertices );
77 77 } else {
78 78 _vertices = 0;
79 79 }
80 80 if (del) {
81 - MemoryManager::SAFE_DELETE_ARRAY( _triangles );
81 + MemoryManager::DELETE_ARRAY( _triangles );
82 82 } else {
83 83 _triangles = 0;
84 84 }
85 85 if (del) {
86 - MemoryManager::SAFE_DELETE_ARRAY( _normals );
86 + MemoryManager::DELETE_ARRAY( _normals );
87 87 } else {
88 88 _normals = 0;
89 89 }
  @@ -126,18 +126,37 @@
126 126 };
127 127
128 128 ///Load the input geometry from file (Wavefront OBJ format) and save it in 'outData'
129 - bool loadMeshFile(NavModelData& outData, const char* fileName);
129 + bool loadMeshFile(NavModelData& outData,
130 + const char* fileName);
130 131 ///Save the navigation input geometry in Wavefront OBJ format
131 - bool saveMeshFile(const NavModelData& inData, const char* filename);
132 + bool saveMeshFile(const NavModelData& inData,
133 + const char* filename);
132 134 ///Merge the data from two navigation geometry sources
133 - NavModelData mergeModels(NavModelData& a,NavModelData& b, bool delOriginals = false);
135 + NavModelData mergeModels(NavModelData& a,
136 + NavModelData& b,
137 + bool delOriginals = false);
134 138 ///Parsing method that calls itself recursively untill all geometry has been parsed
135 - bool parse(const BoundingBox& box, NavModelData& outData, SceneGraphNode* sgn);
136 -
137 - void addVertex(NavModelData* modelData, const vec3<F32>& vertex);
138 - void addTriangle(NavModelData* modelData,const vec3<U32>& triangleIndices, U32 triangleIndexOffset = 0, const SamplePolyAreas& areaType = SAMPLE_POLYAREA_GROUND);
139 - char* parseRow(char* buf, char* bufEnd, char* row, I32 len);
140 - I32 parseFace(char* row, I32* data, I32 n, I32 vcnt);
139 + bool parse(const BoundingBox& box,
140 + NavModelData& outData,
141 + SceneGraphNode* sgn);
142 +
143 + void addVertex(NavModelData* modelData,
144 + const vec3<F32>& vertex);
145 +
146 + void addTriangle(NavModelData* modelData,
147 + const vec3<U32>& triangleIndices,
148 + U32 triangleIndexOffset = 0,
149 + const SamplePolyAreas& areaType = SAMPLE_POLYAREA_GROUND);
150 +
151 + char* parseRow(char* buf,
152 + char* bufEnd,
153 + char* row,
154 + I32 len);
155 +
156 + I32 parseFace(char* row,
157 + I32* data,
158 + I32 n,
159 + I32 vcnt);
141 160 };
142 161 }; //namespace Navigation
143 162 }; //namespace AI