Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add normalization steps for all scene object names to the RSW decoder #377

Merged
merged 2 commits into from
Feb 18, 2024
+30 −29
Merged

Add normalization steps for all scene object names to the RSW decoder #377

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df4e979
RSW: Ensure RSM model paths are fully normalized
rdw-software Feb 18, 2024
93539bd
RSW: Add normalization steps for all scene object names
rdw-software Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Loading
Loading status checks…
RSW: Add normalization steps for all scene object names 
And I forgot about those, as well. They're all gibberish, although it shouldn't matter as the names aren't required to render the objects.
@rdw-software
rdw-software committed Feb 18, 2024
commit 93539bd084fd5ecbd84360fb4de653713566788c
8 changes: 4 additions & 4 deletions Core/FileFormats/RagnarokRSW.lua
View file
Original file line number Diff line number Diff line change
@@ -325,7 +325,7 @@ function RagnarokRSW:DecodeAnimatedProps()
objectInfo.unknownMysteryByte = 0
end

objectInfo.name = iconv.convert(ffi_string(prop.name), "CP949", "UTF-8") or ""
objectInfo.name = RagnarokGRF:DecodeFileName(ffi_string(prop.name))
objectInfo.animationTypeID = tonumber(prop.animation_type_id)
objectInfo.animationSpeedPercentage = tonumber(prop.animation_speed)
objectInfo.isSolid = tonumber(prop.block_type_id) == RagnarokRSW.PROP_COLLISION_TYPE_SOLID
@@ -363,7 +363,7 @@ function RagnarokRSW:DecodeDynamicLightSource()
end

local lightSource = {
name = ffi_string(objectInfo.name),
name = iconv.convert(ffi_string(objectInfo.name), "CP949", "UTF-8") or "",
normalizedWorldPosition = {
x = objectInfo.position.x * RagnarokGND.NORMALIZING_SCALE_FACTOR,
y = -1 * objectInfo.position.y * RagnarokGND.NORMALIZING_SCALE_FACTOR,
@@ -383,7 +383,7 @@ end
function RagnarokRSW:DecodeSpatialAudioSource()
local reader = self.reader
local objectInfo = {
name = reader:GetNullTerminatedString(80),
name = iconv.convert(reader:GetNullTerminatedString(80), "CP949", "UTF-8") or "",
soundFile = reader:GetNullTerminatedString(80),
normalizedWorldPosition = {
x = reader:GetFloat() * RagnarokGND.NORMALIZING_SCALE_FACTOR,
@@ -427,7 +427,7 @@ function RagnarokRSW:DecodeParticleEffectEmitter()
local particleEmissionDelayInSeconds = emitter.emission_speed / expectedFPS

local objectInfo = {
name = ffi_string(emitter.name),
name = iconv.convert(ffi_string(emitter.name), "CP949", "UTF-8") or "",
normalizedWorldPosition = {
x = emitter.position.x * RagnarokGND.NORMALIZING_SCALE_FACTOR,
y = -1 * emitter.position.y * RagnarokGND.NORMALIZING_SCALE_FACTOR,
48 changes: 24 additions & 24 deletions Tests/FileFormats/RagnarokRSW.spec.lua
View file
Original file line number Diff line number Diff line change
@@ -57,11 +57,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -74,11 +74,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 0)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)
@@ -204,11 +204,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -221,11 +221,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 0)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)
@@ -351,11 +351,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -368,11 +368,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 0)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)
@@ -498,11 +498,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -515,11 +515,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 0)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)
@@ -637,11 +637,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -654,11 +654,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 0)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)
@@ -776,11 +776,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.numSceneObjects, 8)

assertEquals(#rsw.animatedProps, 2)
assertEquals(rsw.animatedProps[1].name, "Doodad1")
assertEquals(rsw.animatedProps[1].name, "doodad1")
assertEquals(rsw.animatedProps[1].animationTypeID, RagnarokRSW.ANIMATION_TYPE_ONCE)
assertEquals(rsw.animatedProps[1].animationSpeedPercentage, 1.5)
assertEquals(rsw.animatedProps[1].isSolid, false)
assertEquals(rsw.animatedProps[1].rsmFile, "test\\model1.rsm")
assertEquals(rsw.animatedProps[1].rsmFile, "test/model1.rsm")
assertEquals(rsw.animatedProps[1].rsmNodeName, "NodeName1")
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.x, 0.2 * 1)
assertEquals(rsw.animatedProps[1].normalizedWorldPosition.y, -0.2 * 2)
@@ -793,11 +793,11 @@ describe("RagnarokRSW", function()
assertEquals(rsw.animatedProps[1].scale.z, 1)
assertEquals(rsw.animatedProps[1].unknownMysteryByte, 171)

assertEquals(rsw.animatedProps[2].name, "Doodad2")
assertEquals(rsw.animatedProps[2].name, "doodad2")
assertEquals(rsw.animatedProps[2].animationTypeID, RagnarokRSW.ANIMATION_TYPE_LOOPING)
assertEquals(rsw.animatedProps[2].animationSpeedPercentage, 2.5)
assertEquals(rsw.animatedProps[2].isSolid, false)
assertEquals(rsw.animatedProps[2].rsmFile, "ModelName2")
assertEquals(rsw.animatedProps[2].rsmFile, "modelname2")
assertEquals(rsw.animatedProps[2].rsmNodeName, "NodeName2")
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.x, 0.2 * 4)
assertEquals(rsw.animatedProps[2].normalizedWorldPosition.y, -0.2 * 5)