-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #355 from RagnarokResearchLab/132-linear-vertex-fog
Implement linear vertex fog for RSW-based scenes
- Loading branch information
Showing
11 changed files
with
251 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| local FogParameters = require("Core.FileFormats.FogParameters") | ||
| local RagnarokGRF = require("Core.FileFormats.RagnarokGRF") | ||
|
|
||
| local C_Resources = { | ||
| GRF_FILE_PATH = "data.grf", | ||
| PERSISTENT_RESOURCES = { | ||
| ["data/sprite/cursors.act"] = false, | ||
| ["data/sprite/cursors.spr"] = false, | ||
| ["data/fogparametertable.txt"] = FogParameters, | ||
| }, | ||
| } | ||
|
|
||
| local self = C_Resources | ||
|
|
||
| function C_Resources.PreloadPersistentResources() | ||
| local grf = RagnarokGRF() | ||
| grf:Open(self.GRF_FILE_PATH) | ||
|
|
||
| printf("Preloading %d persistent resources from %s", table.count(self.PERSISTENT_RESOURCES), self.GRF_FILE_PATH) | ||
| for filePath, decoder in pairs(self.PERSISTENT_RESOURCES) do | ||
| local fileContents = grf:ExtractFileInMemory(filePath) | ||
| self.PERSISTENT_RESOURCES[filePath] = fileContents | ||
| if decoder then | ||
| printf("Decoding persistent resource: %s", filePath) | ||
| self.PERSISTENT_RESOURCES[filePath] = decoder:DecodeFileContents(fileContents) | ||
| end | ||
| end | ||
|
|
||
| self.grf = grf -- No need to close as reopening would be expensive (OS will free the handle) | ||
| end | ||
|
|
||
| return C_Resources |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| local RagnarokGRF = require("Core.FileFormats.RagnarokGRF") | ||
|
|
||
| local C_Resources = require("Core.NativeClient.C_Resources") | ||
|
|
||
| describe("C_Resources", function() | ||
| describe("PreloadPersistentResources", function() | ||
| local DEFAULT_GRF_PATH = C_Resources.GRF_FILE_PATH | ||
| local PRELOADED_ASSET_FILES = C_Resources.PERSISTENT_RESOURCES | ||
|
|
||
| after(function() | ||
| C_Resources.GRF_FILE_PATH = DEFAULT_GRF_PATH | ||
| C_Resources.PERSISTENT_RESOURCES = PRELOADED_ASSET_FILES | ||
| end) | ||
|
|
||
| it("should throw if the configured asset container doesn't exist", function() | ||
| local function preloadFromNonExistingGRF() | ||
| C_Resources.GRF_FILE_PATH = "invalid.grf" | ||
| C_Resources.PreloadPersistentResources() | ||
| end | ||
| local expectedErrorMessage = "Failed to open archive invalid.grf (No such file exists)" | ||
| assertThrows(preloadFromNonExistingGRF, expectedErrorMessage) | ||
| end) | ||
|
|
||
| it("should throw if the configured asset container isn't a valid GRF archive", function() | ||
| local SOME_EXISTING_FILE = path.join("Tests", "Fixtures", "test.rgz") | ||
| local function preloadFromInvalidGRF() | ||
| C_Resources.GRF_FILE_PATH = SOME_EXISTING_FILE | ||
| C_Resources.PreloadPersistentResources() | ||
| end | ||
| local expectedErrorMessage = format("Failed to open archive %s (Not a .grf file)", SOME_EXISTING_FILE) | ||
| assertThrows(preloadFromInvalidGRF, expectedErrorMessage) | ||
| end) | ||
|
|
||
| it("should load and store all persistent resources from the configured asset container", function() | ||
| C_Resources.GRF_FILE_PATH = path.join("Tests", "Fixtures", "test.grf") | ||
| C_Resources.PERSISTENT_RESOURCES = { | ||
| ["hello-grf.txt"] = false, | ||
| ["subdirectory/hello.txt"] = false, | ||
| ["uppercase.png"] = false, | ||
| ["안녕하세요.txt"] = false, | ||
| } | ||
| C_Resources.PreloadPersistentResources() | ||
|
|
||
| local grf = RagnarokGRF() | ||
| grf:Open(C_Resources.GRF_FILE_PATH) | ||
| local expectedFileContents = { | ||
| ["hello-grf.txt"] = grf:ExtractFileInMemory("hello-grf.txt"), | ||
| ["subdirectory/hello.txt"] = grf:ExtractFileInMemory("subdirectory/hello.txt"), | ||
| ["uppercase.png"] = grf:ExtractFileInMemory("uppercase.png"), | ||
| ["안녕하세요.txt"] = grf:ExtractFileInMemory("안녕하세요.txt"), | ||
| } | ||
| grf:Close() | ||
|
|
||
| -- Might want to add metadata later, but for now just caching the file contents should suffice | ||
| local preloadedAssetFiles = C_Resources.PERSISTENT_RESOURCES | ||
| assertEquals(preloadedAssetFiles["hello-grf.txt"], expectedFileContents["hello-grf.txt"]) | ||
| assertEquals(preloadedAssetFiles["subdirectory/hello.txt"], expectedFileContents["subdirectory/hello.txt"]) | ||
| assertEquals(preloadedAssetFiles["uppercase.png"], expectedFileContents["uppercase.png"]) | ||
| assertEquals(preloadedAssetFiles["안녕하세요.txt"], expectedFileContents["안녕하세요.txt"]) | ||
| end) | ||
|
|
||
| it("should decode any persistent resources that have been assigned a decoder", function() | ||
| C_Resources.GRF_FILE_PATH = path.join("Tests", "Fixtures", "test.grf") | ||
|
|
||
| -- This needs some streamlining once a proper resource management API is implemented | ||
| local MakeshiftImageDecoder = { | ||
| DecodeFileContents = function(self, fileContents) | ||
| local rgbaImageBytes, width, height = C_ImageProcessing.DecodeFileContents(fileContents) | ||
| local imageResource = { | ||
| width = width, | ||
| height = height, | ||
| rgbaImageBytes = rgbaImageBytes, | ||
| } | ||
| return imageResource | ||
| end, | ||
| } | ||
|
|
||
| C_Resources.PERSISTENT_RESOURCES = { | ||
| ["uppercase.png"] = MakeshiftImageDecoder, | ||
| } | ||
| C_Resources.PreloadPersistentResources() | ||
|
|
||
| local grf = RagnarokGRF() | ||
| grf:Open(C_Resources.GRF_FILE_PATH) | ||
|
|
||
| local rgbaImageBytes, width, height = | ||
| C_ImageProcessing.DecodeFileContents(grf:ExtractFileInMemory("uppercase.png")) | ||
| local expectedFileContents = { | ||
| ["uppercase.png"] = { | ||
| rgbaImageBytes = rgbaImageBytes, | ||
| width = width, | ||
| height = height, | ||
| }, | ||
| } | ||
| grf:Close() | ||
|
|
||
| -- Might want to add metadata later, but for now just caching the file contents should suffice | ||
| local preloadedAssetFiles = C_Resources.PERSISTENT_RESOURCES | ||
| assertEquals(preloadedAssetFiles["uppercase.png"], expectedFileContents["uppercase.png"]) | ||
| end) | ||
| end) | ||
| end) |
Oops, something went wrong.