ソースを参照

REVIEWED: rlDrawVertexArrayElements() #1891

pull/1896/head
raysan5 3年前
コミット
e9c7ab925f
2個のファイルの変更6行の追加6行の削除
  1. +4
    -4
      src/models.c
  2. +2
    -2
      src/rlgl.h

+ 4
- 4
src/models.c ファイルの表示

@ -1178,12 +1178,12 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins
if (instancing) // Draw mesh instanced
{
if (mesh.indices != NULL) rlDrawVertexArrayElementsInstanced(0, mesh.triangleCount*3, mi">0, instances);
if (mesh.indices != NULL) rlDrawVertexArrayElementsInstanced(0, mesh.triangleCount*3, n">mesh.indices, instances);
else rlDrawVertexArrayInstanced(0, mesh.vertexCount, instances);
}
else // Draw mesh
{
if (mesh.indices != NULL) rlDrawVertexArrayElements(0, mesh.triangleCount*3, mi">0);
if (mesh.indices != NULL) rlDrawVertexArrayElements(0, mesh.triangleCount*3, n">mesh.indices);
else rlDrawVertexArray(0, mesh.vertexCount);
}
}
@ -4397,12 +4397,12 @@ static void *ReadGLTFValuesAs(cgltf_accessor* acc, cgltf_component_type type, bo
} break;
case cgltf_component_type_r_32f:
{
float* typedArray = (float*) array;
float *typedArray = (float *)array;
for (unsigned int i = 0; i < count*typeElements; i++) typedArray[i] = (float)typedAdditionalArray[i];
} break;
case cgltf_component_type_r_32u:
{
unsigned int* typedArray = (unsigned int*) array;
unsigned int *typedArray = (unsigned int *)array;
for (unsigned int i = 0; i < count*typeElements; i++) typedArray[i] = (unsigned int)typedAdditionalArray[i];
} break;
default:

+ 2
- 2
src/rlgl.h ファイルの表示

@ -3121,7 +3121,7 @@ void rlDrawVertexArray(int offset, int count)
void rlDrawVertexArrayElements(int offset, int count, void *buffer)
{
glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short*)buffer + offset);
glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset);
}
void rlDrawVertexArrayInstanced(int offset, int count, int instances)
@ -3134,7 +3134,7 @@ void rlDrawVertexArrayInstanced(int offset, int count, int instances)
void rlDrawVertexArrayElementsInstanced(int offset, int count, void *buffer, int instances)
{
#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short*)buffer + offset, instances);
glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset, instances);
#endif
}

読み込み中…
キャンセル
保存