feat: Raw reading on zone load and scene tools #1910

aronwk-aaron · 2025-10-15T03:54:40Z

the main reason behind doing this is to get what scene the player is in.
also implemented building an adjacency list of scenes and getting adjacent scenes for a given scene
Also make an option for outputting the raw as obj on world load
and add scene colors to the obj

added option to automatically write the raw obj file Added scene colors to the obj use proper scene colors from hf

…lameUniverse/DarkflameServer into raw-parsing-for-scene-data

fixup some comments

Copilot

Pull Request Overview

This PR implements raw terrain file reading on zone load to enable scene identification from player positions. Key changes include parsing .raw terrain files, building a scene adjacency graph from scene transitions, and adding developer commands for scene debugging and visualization.

Adds comprehensive RAW terrain file parsing with scene map support
Implements scene ID lookup from world positions and scene adjacency graph construction
Adds developer commands for scene debugging and visualization with OBJ export capability

Reviewed Changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated 17 comments.

Show a summary per file

File	Description
resources/worldconfig.ini	Adds config option to export terrain meshes to OBJ files for debugging
dZoneManager/dZoneManager.h	Declares scene position lookup, adjacency list access, and scene graph building methods
dZoneManager/dZoneManager.cpp	Implements scene position queries, scene graph construction from transitions, and global scene connectivity
dZoneManager/Zone.h	Adds Raw terrain data storage and scene lookup methods
dZoneManager/Zone.cpp	Implements zone file version checking, Raw file loading, and optional OBJ export
dZoneManager/Raw.h	Defines complete terrain chunk structures, scene vertex data, and mesh generation/export functions
dZoneManager/Raw.cpp	Implements RAW file parsing, terrain mesh generation with scene IDs, and OBJ export with scene colors
dZoneManager/CMakeLists.txt	Adds Raw.cpp to build and includes SceneColor.h path
dNavigation/dTerrain/*	Removes old unused terrain parsing code
dNavigation/dNavMesh.cpp	Removes unused RawFile.h include
dNavigation/CMakeLists.txt	Removes dTerrain subdirectory from build
dGame/dUtilities/SlashCommands/DEVGMCommands.h	Declares four new scene debugging commands
dGame/dUtilities/SlashCommands/DEVGMCommands.cpp	Implements GetScene, GetAdjacentScenes, SpawnScenePoints, and SpawnAllScenePoints commands
dGame/dUtilities/SlashCommandHandler.cpp	Registers the four new scene debugging commands
dCommon/dClient/SceneColor.h	Defines color palette for visualizing scene IDs in OBJ exports
dCommon/NiColor.h	Adds RGB color structure with grayscale conversion

Comments suppressed due to low confidence (1)

dZoneManager/Raw.cpp:1

Potential division by zero in GetSceneIDFromPosition if chunk dimensions are 1. Similar to the issue in GenerateTerrainMesh, if chunk.width or chunk.height equals 1, this will cause division by zero. Add validation before these calculations.

#include "Raw.h"

Copilot · 2025-11-16T20:14:20Z

dZoneManager/Raw.cpp

+	BinaryIO::BinaryRead(stream, chunk.width);
+	BinaryIO::BinaryRead(stream, chunk.height);
+	BinaryIO::BinaryRead(stream, chunk.offsetX);
+	BinaryIO::BinaryRead(stream, chunk.offsetZ);
+
+	if (stream.fail()) {


Inconsistent indentation in ReadChunk function. Lines 61-67 use single tab indentation while surrounding code uses double tab indentation. According to the project's coding standards, indentation should be consistent with tabs (4 spaces). Lines 61-67 should be indented to match the surrounding code structure.

Suggested change

BinaryIO::BinaryRead(stream, chunk.width);

BinaryIO::BinaryRead(stream, chunk.height);

BinaryIO::BinaryRead(stream, chunk.offsetX);

BinaryIO::BinaryRead(stream, chunk.offsetZ);

if (stream.fail()) {

BinaryIO::BinaryRead(stream, chunk.width);

BinaryIO::BinaryRead(stream, chunk.height);

BinaryIO::BinaryRead(stream, chunk.offsetX);

BinaryIO::BinaryRead(stream, chunk.offsetZ);

if (stream.fail()) {

Copilot · 2025-11-16T20:14:21Z

dZoneManager/Raw.cpp

+		for (const auto& chunk : outRaw.chunks) {
+			// Calculate chunk bounds
+			const float chunkMinX = chunk.offsetX;
+			const float chunkMinZ = chunk.offsetZ;
+			const float chunkMaxX = chunkMinX + (chunk.width * chunk.scaleFactor);
+			const float chunkMaxZ = chunkMinZ + (chunk.height * chunk.scaleFactor);
+
+				// Update overall bounds
+				outRaw.minBoundsX = std::min(outRaw.minBoundsX, chunkMinX);
+				outRaw.minBoundsZ = std::min(outRaw.minBoundsZ, chunkMinZ);
+				outRaw.maxBoundsX = std::max(outRaw.maxBoundsX, chunkMaxX);
+				outRaw.maxBoundsZ = std::max(outRaw.maxBoundsZ, chunkMaxZ);
+			}				LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]", 
+					outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);
+			}


Inconsistent indentation. This line and lines 275-286 appear to have incorrect indentation (single tab instead of double tab) based on the surrounding code structure. The entire loop body should be indented consistently with the rest of the function.

Suggested change

for (const auto& chunk : outRaw.chunks) {

// Calculate chunk bounds

const float chunkMinX = chunk.offsetX;

const float chunkMinZ = chunk.offsetZ;

const float chunkMaxX = chunkMinX + (chunk.width * chunk.scaleFactor);

const float chunkMaxZ = chunkMinZ + (chunk.height * chunk.scaleFactor);

// Update overall bounds

outRaw.minBoundsX = std::min(outRaw.minBoundsX, chunkMinX);

outRaw.minBoundsZ = std::min(outRaw.minBoundsZ, chunkMinZ);

outRaw.maxBoundsX = std::max(outRaw.maxBoundsX, chunkMaxX);

outRaw.maxBoundsZ = std::max(outRaw.maxBoundsZ, chunkMaxZ);

} LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]",

outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);

}

for (const auto& chunk : outRaw.chunks) {

// Calculate chunk bounds

const float chunkMinX = chunk.offsetX;

const float chunkMinZ = chunk.offsetZ;

const float chunkMaxX = chunkMinX + (chunk.width * chunk.scaleFactor);

const float chunkMaxZ = chunkMinZ + (chunk.height * chunk.scaleFactor);

// Update overall bounds

outRaw.minBoundsX = std::min(outRaw.minBoundsX, chunkMinX);

outRaw.minBoundsZ = std::min(outRaw.minBoundsZ, chunkMinZ);

outRaw.maxBoundsX = std::max(outRaw.maxBoundsX, chunkMaxX);

outRaw.maxBoundsZ = std::max(outRaw.maxBoundsZ, chunkMaxZ);

}

LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]",

outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);

}

Copilot · 2025-11-16T20:14:21Z

dZoneManager/Raw.cpp

+			}				LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]", 
+					outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);
+			}


LOG statement appears on the same line as a closing brace without proper indentation or line break. This should be on its own line with proper indentation for readability.

Suggested change

} LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]",

outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);

}

}

LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]",

outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);

}

Copilot · 2025-11-16T20:14:21Z

dZoneManager/Raw.cpp

+			}				LOG("Raw terrain bounds: X[%.2f, %.2f], Z[%.2f, %.2f]", 
+					outRaw.minBoundsX, outRaw.maxBoundsX, outRaw.minBoundsZ, outRaw.maxBoundsZ);
+			}
+		}			return true;


Return statement appears on the same line as a closing brace. This should be on its own line with proper indentation for readability and consistency with the rest of the codebase.

Suggested change

} return true;

}

return true;

Copilot · 2025-11-16T20:14:22Z

dZoneManager/Raw.cpp

+				const float y = chunk.heightMap[heightIndex];
+
+				// Calculate world position				
+				const float worldX = ((i) + (chunk.offsetX / chunk.scaleFactor)) * chunk.scaleFactor;
+				const float worldY = (y / chunk.scaleFactor) * chunk.scaleFactor;
+				const float worldZ = ((j) + (chunk.offsetZ / chunk.scaleFactor)) * chunk.scaleFactor;
+
+				const NiPoint3 worldPos(worldX, worldY, worldZ);
+
+			// Get scene ID at this position
+			// Map heightmap position to scene map position
+			// The scene map is colorMapResolution x colorMapResolution
+			// We need to map from heightmap coordinates (i, j) to scene map coordinates
+			const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);
+			const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);
+
+			const uint32_t sceneI = std::min(static_cast<uint32_t>(sceneMapI), chunk.colorMapResolution - 1);
+			const uint32_t sceneJ = std::min(static_cast<uint32_t>(sceneMapJ), chunk.colorMapResolution - 1);
+			// Scene map uses the same indexing pattern as heightmap: row * width + col
+			const uint32_t sceneIndex = sceneI * chunk.colorMapResolution + sceneJ;
+
+			uint8_t sceneID = 0;
+			if (sceneIndex < chunk.sceneMap.size()) {
+				sceneID = chunk.sceneMap[sceneIndex];
+			}					
+			outMesh.vertices.emplace_back(worldPos, sceneID);


Inconsistent indentation starting at line 325. Lines 325-350 appear to use incorrect indentation (should be triple tab based on nesting level). The code should maintain consistent tab indentation throughout the nested loops.

Suggested change

const float y = chunk.heightMap[heightIndex];

// Calculate world position

const float worldX = ((i) + (chunk.offsetX / chunk.scaleFactor)) * chunk.scaleFactor;

const float worldY = (y / chunk.scaleFactor) * chunk.scaleFactor;

const float worldZ = ((j) + (chunk.offsetZ / chunk.scaleFactor)) * chunk.scaleFactor;

const NiPoint3 worldPos(worldX, worldY, worldZ);

// Get scene ID at this position

// Map heightmap position to scene map position

// The scene map is colorMapResolution x colorMapResolution

// We need to map from heightmap coordinates (i, j) to scene map coordinates

const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);

const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);

const uint32_t sceneI = std::min(static_cast<uint32_t>(sceneMapI), chunk.colorMapResolution - 1);

const uint32_t sceneJ = std::min(static_cast<uint32_t>(sceneMapJ), chunk.colorMapResolution - 1);

// Scene map uses the same indexing pattern as heightmap: row * width + col

const uint32_t sceneIndex = sceneI * chunk.colorMapResolution + sceneJ;

uint8_t sceneID = 0;

if (sceneIndex < chunk.sceneMap.size()) {

sceneID = chunk.sceneMap[sceneIndex];

}

outMesh.vertices.emplace_back(worldPos, sceneID);

const float y = chunk.heightMap[heightIndex];

// Calculate world position

const float worldX = ((i) + (chunk.offsetX / chunk.scaleFactor)) * chunk.scaleFactor;

const float worldY = (y / chunk.scaleFactor) * chunk.scaleFactor;

const float worldZ = ((j) + (chunk.offsetZ / chunk.scaleFactor)) * chunk.scaleFactor;

const NiPoint3 worldPos(worldX, worldY, worldZ);

// Get scene ID at this position

// Map heightmap position to scene map position

// The scene map is colorMapResolution x colorMapResolution

// We need to map from heightmap coordinates (i, j) to scene map coordinates

const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);

const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);

const uint32_t sceneI = std::min(static_cast<uint32_t>(sceneMapI), chunk.colorMapResolution - 1);

const uint32_t sceneJ = std::min(static_cast<uint32_t>(sceneMapJ), chunk.colorMapResolution - 1);

// Scene map uses the same indexing pattern as heightmap: row * width + col

const uint32_t sceneIndex = sceneI * chunk.colorMapResolution + sceneJ;

uint8_t sceneID = 0;

if (sceneIndex < chunk.sceneMap.size()) {

sceneID = chunk.sceneMap[sceneIndex];

}

outMesh.vertices.emplace_back(worldPos, sceneID);

Copilot · 2025-11-16T20:14:24Z

dZoneManager/dZoneManager.cpp

+		if (m_SceneAdjacencyList.find(sceneID) == m_SceneAdjacencyList.end()) {
+			m_SceneAdjacencyList[sceneID] = std::vector<LWOSCENEID>();
+		}


Inefficient double lookup in associency list. The code performs find() then uses operator[] which causes a second lookup. Use insert() or emplace() to avoid the double lookup: m_SceneAdjacencyList.try_emplace(sceneID, std::vector<LWOSCENEID>()); or check the return value of insert/emplace.

Suggested change

if (m_SceneAdjacencyList.find(sceneID) == m_SceneAdjacencyList.end()) {

m_SceneAdjacencyList[sceneID] = std::vector<LWOSCENEID>();

}

m_SceneAdjacencyList.try_emplace(sceneID, std::vector<LWOSCENEID>());

Copilot · 2025-11-16T20:14:24Z

dZoneManager/Raw.cpp

+			const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);
+			const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);


Potential division by zero if chunk.width or chunk.height equals 1. If a chunk has width or height of 1, the expressions chunk.width - 1 or chunk.height - 1 will be 0, causing division by zero. Add a check to ensure width and height are greater than 1 before this calculation.

Suggested change

const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);

const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);

const float sceneMapI = (chunk.width > 1) ? ((static_cast<float>(i) / static_cast<float>(chunk.width - 1)) * static_cast<float>(chunk.colorMapResolution - 1)) : 0.0f;

const float sceneMapJ = (chunk.height > 1) ? ((static_cast<float>(j) / static_cast<float>(chunk.height - 1)) * static_cast<float>(chunk.colorMapResolution - 1)) : 0.0f;

Copilot · 2025-11-16T20:14:25Z

dZoneManager/Raw.h

+#ifndef __RAW_H__
+#define __RAW_H__


Include guard uses reserved identifier pattern. Names containing double underscores (__) are reserved for the implementation in C++. Use a standard include guard pattern like RAW_H or DZONEMANAGER_RAW_H instead of __RAW_H__.

Suggested change

#ifndef __RAW_H__

#define __RAW_H__

#ifndef DZONEMANAGER_RAW_H

#define DZONEMANAGER_RAW_H

Copilot · 2025-11-16T20:14:25Z

dCommon/NiColor.h

+#ifndef NICOLOR_H
+#define NICOLOR_H


[nitpick] Include guard naming is inconsistent with other files in the project. While this guard is correctly formed (not using reserved identifiers), it should follow the project's naming convention. Consider using a more specific name like DCOMMON_NICOLOR_H to avoid potential conflicts.

Copilot · 2025-11-16T20:14:25Z

dCommon/dClient/SceneColor.h

+#ifndef SCENE_COLOR_H
+#define SCENE_COLOR_H


[nitpick] Include guard naming should be more specific to avoid conflicts. Consider using a more specific name like DCOMMON_DCLIENT_SCENECOLOR_H to match the file's location in the project structure and avoid potential naming conflicts.

Impl raw reading, and some slash commands to test with scenes

12fd9d0

aronwk-aaron changed the title ~~Feat: Raw reading on zone load and scene tools~~ feat: Raw reading on zone load and scene tools Oct 15, 2025

aronwk-aaron added 5 commits October 15, 2025 19:56

Correct scene making, merged the old raw into the new.

accdb4f

added option to automatically write the raw obj file Added scene colors to the obj use proper scene colors from hf

idk

893d127

Merge branch 'main' into raw-parsing-for-scene-data

2d744af

NL@EOF

6ea46ef

Merge branch 'raw-parsing-for-scene-data' of https://github.com/Darkf…

09ca193

…lameUniverse/DarkflameServer into raw-parsing-for-scene-data

aronwk-aaron marked this pull request as ready for review October 16, 2025 01:12

aronwk-aaron requested review from EmosewaMC and Wincent01 October 16, 2025 01:12

aronwk-aaron added 6 commits October 16, 2025 01:19

better algo for finding what scene we are in

ae20974

missed staging a line

19637a9

don't try to load the raw if the map version is too old

c87c9c2

fixup some comments

clamp search to bounds

20c05cb

Merge branch 'main' into raw-parsing-for-scene-data

0b4f888

whoops

b7a1ef3

aronwk-aaron requested a review from Copilot November 16, 2025 20:10

Copilot started reviewing on behalf of aronwk-aaron November 16, 2025 20:10 View session

Copilot finished reviewing on behalf of aronwk-aaron November 16, 2025 20:12

Copilot AI reviewed Nov 16, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Raw reading on zone load and scene tools #1910

feat: Raw reading on zone load and scene tools #1910

Uh oh!

aronwk-aaron commented Oct 15, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Copilot AI Nov 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		const float sceneMapI = ((i) / (chunk.width - 1)) * (chunk.colorMapResolution - 1);
		const float sceneMapJ = ((j) / (chunk.height - 1)) * (chunk.colorMapResolution - 1);

feat: Raw reading on zone load and scene tools #1910

Are you sure you want to change the base?

feat: Raw reading on zone load and scene tools #1910

Uh oh!

Conversation

aronwk-aaron commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

aronwk-aaron commented Oct 15, 2025 •

edited

Loading