Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 224 vs 249 for /trunk/Source Code/Libs/src/GLIM/glimBatchData.cpp

Diff revisions: vs.
  @@ -7,7 +7,7 @@
7 7 #include "glimBatchData.h"
8 8 #include "glimInterface.h"
9 9
10 - #define BUFFER_OFFSET(i) ((char *)NULL + (i))
10 + #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
11 11
12 12 namespace NS_GLIM
13 13 {
  @@ -103,11 +103,11 @@
103 103 m_bCreatedVBOs = false;
104 104
105 105 #ifdef AE_RENDERAPI_D3D11
106 - m_pVertexBuffer = NULL;
107 - m_pIndexBuffer_Points = NULL;
108 - m_pIndexBuffer_Lines = NULL;
109 - m_pIndexBuffer_Triangles = NULL;
110 - m_pIndexBuffer_Wireframe = NULL;
106 + m_pVertexBuffer = nullptr;
107 + m_pIndexBuffer_Points = nullptr;
108 + m_pIndexBuffer_Lines = nullptr;
109 + m_pIndexBuffer_Triangles = nullptr;
110 + m_pIndexBuffer_Wireframe = nullptr;
111 111 #endif
112 112
113 113 Reset ();
  @@ -163,31 +163,31 @@
163 163 {
164 164 GLIM_Interface::s_ReleaseResourceCallback (m_pVertexBuffer);
165 165 //m_pVertexBuffer->Release ();
166 - m_pVertexBuffer = NULL;
166 + m_pVertexBuffer = nullptr;
167 167 }
168 168 if (m_pIndexBuffer_Points)
169 169 {
170 170 GLIM_Interface::s_ReleaseResourceCallback (m_pIndexBuffer_Points);
171 171 //m_pIndexBuffer_Points->Release ();
172 - m_pIndexBuffer_Points = NULL;
172 + m_pIndexBuffer_Points = nullptr;
173 173 }
174 174 if (m_pIndexBuffer_Lines)
175 175 {
176 176 GLIM_Interface::s_ReleaseResourceCallback (m_pIndexBuffer_Lines);
177 177 //m_pIndexBuffer_Lines->Release ();
178 - m_pIndexBuffer_Lines = NULL;
178 + m_pIndexBuffer_Lines = nullptr;
179 179 }
180 180 if (m_pIndexBuffer_Triangles)
181 181 {
182 182 GLIM_Interface::s_ReleaseResourceCallback (m_pIndexBuffer_Triangles);
183 183 //m_pIndexBuffer_Triangles->Release ();
184 - m_pIndexBuffer_Triangles = NULL;
184 + m_pIndexBuffer_Triangles = nullptr;
185 185 }
186 186 if (m_pIndexBuffer_Wireframe)
187 187 {
188 188 GLIM_Interface::s_ReleaseResourceCallback (m_pIndexBuffer_Wireframe);
189 189 //m_pIndexBuffer_Wireframe->Release ();
190 - m_pIndexBuffer_Wireframe = NULL;
190 + m_pIndexBuffer_Wireframe = nullptr;
191 191 }
192 192
193 193 m_Signature.clear ();
  @@ -472,7 +472,7 @@
472 472 }
473 473
474 474 glBindBuffer (GL_ARRAY_BUFFER, m_uiVertexBufferID);
475 - glBufferData (GL_ARRAY_BUFFER, uiVertices * uiVertexDataSize, NULL, GL_STATIC_DRAW);
475 + glBufferData (GL_ARRAY_BUFFER, uiVertices * uiVertexDataSize, nullptr, GL_STATIC_DRAW);
476 476
477 477 // first upload the position data
478 478 unsigned int uiOffset = uiVertices * sizeof (float) * 3;