zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-06 08:42:35 +00:00
Code Activity

chore: cleanup and minor addition

Browse Source
This commit is contained in:
LJW-Dev
2026-04-19 11:31:06 +08:00
committed by Jan Laupetin
parent adb26e2707
commit 968b799938
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjCommon/XModel/Gltf/JsonGltf.h
-26
View File
@@ -86,32 +86,6 @@ namespace gltf
NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNodeExtension, KHR_lights_punctual);
class JsonNodeExtras
{
public:
// global
std::optional<std::string> flags; // value: surface flags
std::optional<std::string> pathnode; // value: n/a
// Multiplayer only
std::optional<std::string> xmodel; // value: xmodel name
std::optional<std::string> spawnpoint; // value: (MP)team, (ZM)spawnpoint group name
// Zombies only
std::optional<std::string> zone; // value: zone name
std::optional<std::string> zspawner_group; // value: zone zspawner group name
std::optional<std::string> spawnpoint_group; // value: zone zspawner group name
std::optional<std::string> zspawner; // value: zspawner group name
// scripting
std::optional<std::string> trigger_use;
std::optional<std::string> trigger_multiple;
};
NLOHMANN_DEFINE_TYPE_EXTENSION(
JsonNodeExtras, xmodel, spawnpoint, flags, pathnode, zone, zspawner_group, spawnpoint_group, zspawner, trigger_use, trigger_multiple);
class JsonNode
{
public:
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ namespace
throw GltfLoadException("Index count must be dividable by 3 for triangles");
const auto faceCount = indexCount / 3u;
if (faceCount > UINT16_MAX)
throw GltfLoadException("Face count exceeded the UINT16_MAX");
throw GltfLoadException(std::format("Face count ({}) exceeded the UINT16_MAX", faceCount));
out_surface.vertexCount = static_cast<uint16_t>(vertexCount);
out_surface.triCount = static_cast<uint16_t>(faceCount);