zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-24 05:32:06 +00:00
Code Activity

Refactored to make x64 builds succeed

Browse Source
This commit is contained in:
LJW-Dev
2025-10-27 20:23:13 +08:00
parent 9268342ca1
commit 0e19f365ff
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
View File

@@ -88,7 +88,7 @@ vec3_t BSPUtil::calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs)
return result; return result;
} }
int BSPUtil::allignBy128(int size) size_t BSPUtil::allignBy128(size_t size)
{ {
return ((size + 127) & 0xFFFFFF80); return ((size + 127) & 0xFFFFFF80);
} }

2
src/ObjLoading/Game/T6/BSP/BSPUtil.h
View File

@@ -13,7 +13,7 @@ public:
static void updateAABBWithPoint(vec3_t& point, vec3_t& AABBMins, vec3_t& AABBMaxs); static void updateAABBWithPoint(vec3_t& point, vec3_t& AABBMins, vec3_t& AABBMaxs);
static vec3_t calcMiddleOfAABB(vec3_t& mins, vec3_t& maxs); static vec3_t calcMiddleOfAABB(vec3_t& mins, vec3_t& maxs);
static vec3_t calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs); static vec3_t calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs);
static int allignBy128(int size); static size_t allignBy128(size_t size);
static float distBetweenPoints(vec3_t& p1, vec3_t& p2); static float distBetweenPoints(vec3_t& p1, vec3_t& p2);
static void convertAnglesToAxis(vec3_t* angles, vec3_t* axis); static void convertAnglesToAxis(vec3_t* angles, vec3_t* axis);
static void matrixTranspose3x3(const vec3_t* in, vec3_t* out); static void matrixTranspose3x3(const vec3_t* in, vec3_t* out);

2
src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
View File

@@ -462,7 +462,7 @@ namespace BSP
// any vertex count over the uint16_t max means the vertices above the uint16_t max can't be indexed // any vertex count over the uint16_t max means the vertices above the uint16_t max can't be indexed
if (static_cast<unsigned int>(bsp->colWorld.vertices.size()) > BSPGameConstants::MAX_COLLISION_VERTS) if (static_cast<unsigned int>(bsp->colWorld.vertices.size()) > BSPGameConstants::MAX_COLLISION_VERTS)
{ {
printf("ERROR: collision vertex count %i exceeds the maximum number: %i!\n", clipMap->vertCount, BSPGameConstants::MAX_COLLISION_VERTS); con::error("ERROR: collision vertex count %i exceeds the maximum number: %i!\n", clipMap->vertCount, BSPGameConstants::MAX_COLLISION_VERTS);
return false; return false;
} }

22
src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
View File

@@ -130,18 +130,18 @@ namespace BSP
// set all surface types to lit opaque // set all surface types to lit opaque
gfxWorld->dpvs.litSurfsBegin = 0; gfxWorld->dpvs.litSurfsBegin = 0;
gfxWorld->dpvs.litSurfsEnd = surfaceCount; gfxWorld->dpvs.litSurfsEnd = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.emissiveOpaqueSurfsBegin = surfaceCount; gfxWorld->dpvs.emissiveOpaqueSurfsBegin = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.emissiveOpaqueSurfsEnd = surfaceCount; gfxWorld->dpvs.emissiveOpaqueSurfsEnd = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.emissiveTransSurfsBegin = surfaceCount; gfxWorld->dpvs.emissiveTransSurfsBegin = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.emissiveTransSurfsEnd = surfaceCount; gfxWorld->dpvs.emissiveTransSurfsEnd = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.litTransSurfsBegin = surfaceCount; gfxWorld->dpvs.litTransSurfsBegin = static_cast<unsigned int>(surfaceCount);
gfxWorld->dpvs.litTransSurfsEnd = surfaceCount; gfxWorld->dpvs.litTransSurfsEnd = static_cast<unsigned int>(surfaceCount);
// visdata is written to by the game // visdata is written to by the game
// all visdata is alligned by 128 // all visdata is alligned by 128
unsigned int allignedSurfaceCount = BSPUtil::allignBy128(surfaceCount); size_t allignedSurfaceCount = BSPUtil::allignBy128(surfaceCount);
gfxWorld->dpvs.surfaceVisDataCount = allignedSurfaceCount; gfxWorld->dpvs.surfaceVisDataCount = static_cast<unsigned int>(allignedSurfaceCount);
gfxWorld->dpvs.surfaceVisData[0] = m_memory.Alloc<char>(allignedSurfaceCount); gfxWorld->dpvs.surfaceVisData[0] = m_memory.Alloc<char>(allignedSurfaceCount);
gfxWorld->dpvs.surfaceVisData[1] = m_memory.Alloc<char>(allignedSurfaceCount); gfxWorld->dpvs.surfaceVisData[1] = m_memory.Alloc<char>(allignedSurfaceCount);
gfxWorld->dpvs.surfaceVisData[2] = m_memory.Alloc<char>(allignedSurfaceCount); gfxWorld->dpvs.surfaceVisData[2] = m_memory.Alloc<char>(allignedSurfaceCount);
@@ -228,8 +228,8 @@ namespace BSP
// visdata is written to by the game // visdata is written to by the game
// all visdata is alligned by 128 // all visdata is alligned by 128
int allignedModelCount = BSPUtil::allignBy128(modelCount); size_t allignedModelCount = BSPUtil::allignBy128(modelCount);
gfxWorld->dpvs.smodelVisDataCount = allignedModelCount; gfxWorld->dpvs.smodelVisDataCount = static_cast<unsigned int>(allignedModelCount);
gfxWorld->dpvs.smodelVisData[0] = m_memory.Alloc<char>(allignedModelCount); gfxWorld->dpvs.smodelVisData[0] = m_memory.Alloc<char>(allignedModelCount);
gfxWorld->dpvs.smodelVisData[1] = m_memory.Alloc<char>(allignedModelCount); gfxWorld->dpvs.smodelVisData[1] = m_memory.Alloc<char>(allignedModelCount);
gfxWorld->dpvs.smodelVisData[2] = m_memory.Alloc<char>(allignedModelCount); gfxWorld->dpvs.smodelVisData[2] = m_memory.Alloc<char>(allignedModelCount);

2
src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
View File

@@ -119,7 +119,7 @@ namespace BSP
mapEnts->name = m_memory.Dup(bsp->bspName.c_str()); mapEnts->name = m_memory.Dup(bsp->bspName.c_str());
mapEnts->entityString = m_memory.Dup(entityString.c_str()); mapEnts->entityString = m_memory.Dup(entityString.c_str());
mapEnts->numEntityChars = entityString.length() + 1; // numEntityChars includes the null character mapEnts->numEntityChars = static_cast<int>(entityString.length() + 1); // numEntityChars includes the null character
// don't need these // don't need these
mapEnts->trigger.count = 0; mapEnts->trigger.count = 0;

1
src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp
View File

@@ -2,7 +2,6 @@
#include "BSPCreator.h" #include "BSPCreator.h"
#include "BSPUtil.h" #include "BSPUtil.h"
#include "Linker/BSPLinker.h" #include "Linker/BSPLinker.h"
//#include "CustomMapLinker.h"
namespace namespace
{ {