TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux implementation. Include changes for gcc x64.

Browse source
This commit is contained in:
LuisAntonRebollo 2015-01-24 22:08:26 +01:00
parent 4e52824a42
commit 4e9034854d
56 changed files with 1108 additions and 3075 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/ts/loader/tsShapeLoader.cpp
View file

@ -382,7 +382,7 @@ void TSShapeLoader::generateSubshapes()
bool cmpMeshNameAndSize(const String& key, const Vector<String>& names, void* arg1, void* arg2)
{
const Vector<AppMesh*>& meshes = *(Vector<AppMesh*>*)arg1;
S32 meshSize = (S32)arg2;
S32 meshSize = (intptr_t)arg2;
for (S32 i = 0; i < names.size(); i++)
{

2
Engine/source/ts/tsMesh.cpp
View file

@ -206,7 +206,7 @@ void TSMesh::innerRender( TSMaterialList *materials, const TSRenderState &rdata,
coreRI->vertBuff = &vb;
coreRI->primBuff = &pb;
coreRI->defaultKey2 = (U32) coreRI->vertBuff;
coreRI->defaultKey2 = (uintptr_t) coreRI->vertBuff;
coreRI->materialHint = rdata.getMaterialHint();

2
Engine/source/ts/tsShape.cpp
View file

@ -1171,7 +1171,7 @@ void TSShape::assembleShape()
TSMesh * mesh = TSMesh::assembleMesh(meshType,skip);
if (ptr32)
{
ptr32[i] = skip ? 0 : (S32)mesh;
ptr32[i] = skip ? 0 : (intptr_t)mesh; // @todo 64bit
meshes.push_back(skip ? 0 : mesh);
}