yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use asOFFSET instead of offsetof because compilation fails on gcc-4.8

Browse Source
This commit is contained in:
yvt 2014-04-13 23:25:52 +09:00
parent 8496e5f73e
commit 681feaa125
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Draw/GLMapChunk.cpp
View File

@ -33,6 +33,8 @@
SPADES_SETTING(r_water, "2");
#include <AngelScript/include/angelscript.h> // for asOFFSET. somehow `offsetof` fails on gcc-4.8
namespace spades {
namespace draw {
GLMapChunk::GLMapChunk(spades::draw::GLMapRenderer *r, client::GameMap *mp,
@ -364,22 +366,22 @@ namespace spades {
device->BindBuffer(IGLDevice::ArrayBuffer, buffer);
device->VertexAttribPointer(positionAttribute(), 3,
IGLDevice::UnsignedByte, false,
sizeof(Vertex), (void *)offsetof(Vertex, x));
sizeof(Vertex), (void *)asOFFSET(Vertex, x));
if(ambientOcclusionCoordAttribute() != -1)
device->VertexAttribPointer(ambientOcclusionCoordAttribute(), 2,
IGLDevice::UnsignedShort, false,
sizeof(Vertex), (void *)offsetof(Vertex, aoX));
sizeof(Vertex), (void *)asOFFSET(Vertex, aoX));
device->VertexAttribPointer(colorAttribute(), 4,
IGLDevice::UnsignedByte, true,
sizeof(Vertex), (void *)offsetof(Vertex, colorRed));
sizeof(Vertex), (void *)asOFFSET(Vertex, colorRed));
if(normalAttribute() != -1)
device->VertexAttribPointer(normalAttribute(), 3,
IGLDevice::Byte, false,
sizeof(Vertex), (void *)offsetof(Vertex, nx));
sizeof(Vertex), (void *)asOFFSET(Vertex, nx));
device->VertexAttribPointer(fixedPositionAttribute(), 3,
IGLDevice::Byte, false,
sizeof(Vertex), (void *)offsetof(Vertex, sx));
sizeof(Vertex), (void *)asOFFSET(Vertex, sx));
device->BindBuffer(IGLDevice::ArrayBuffer, 0);
device->BindBuffer(IGLDevice::ElementArrayBuffer,
@ -443,13 +445,13 @@ namespace spades {
device->BindBuffer(IGLDevice::ArrayBuffer, buffer);
device->VertexAttribPointer(positionAttribute(), 3,
IGLDevice::UnsignedByte, false,
sizeof(Vertex), (void *)offsetof(Vertex, x));
sizeof(Vertex), (void *)asOFFSET(Vertex, x));
device->VertexAttribPointer(colorAttribute(), 4,
IGLDevice::UnsignedByte, true,
sizeof(Vertex), (void *)offsetof(Vertex, colorRed));
sizeof(Vertex), (void *)asOFFSET(Vertex, colorRed));
device->VertexAttribPointer(normalAttribute(), 3,
IGLDevice::Byte, false,
sizeof(Vertex), (void *)offsetof(Vertex, nx));
sizeof(Vertex), (void *)asOFFSET(Vertex, nx));
device->BindBuffer(IGLDevice::ArrayBuffer, 0);
device->BindBuffer(IGLDevice::ElementArrayBuffer,