Skip to content

ShaderNodeDefinitionLoader: Ensures clean instance state #2510

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

Merged
merged 1 commit into from
Jun 27, 2025
Merged

ShaderNodeDefinitionLoader: Ensures clean instance state #2510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions jme3-core/src/plugins/java/com/jme3/material/plugins/ShaderNodeDefinitionLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2018 jMonkeyEngine
* Copyright (c) 2009-2025 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -38,13 +38,14 @@
import com.jme3.asset.ShaderNodeDefinitionKey;
import com.jme3.util.blockparser.BlockLanguageParser;
import com.jme3.util.blockparser.Statement;

import java.io.IOException;
import java.io.InputStream;
import java.util.List;

/**
* ShaderNodeDefinition file loader (.j3sn)
*
* <p>
* a j3sn file is a block style file like j3md or j3m. It must contain one
* ShaderNodeDefinition{} block that contains several ShaderNodeDefinition{}
* blocks
Expand All @@ -53,16 +54,14 @@
*/
public class ShaderNodeDefinitionLoader implements AssetLoader {

private ShaderNodeLoaderDelegate loaderDelegate;

@Override
public Object load(AssetInfo assetInfo) throws IOException {
AssetKey k = assetInfo.getKey();
if (!(k instanceof ShaderNodeDefinitionKey)) {
AssetKey<?> assetKey = assetInfo.getKey();
if (!(assetKey instanceof ShaderNodeDefinitionKey)) {
throw new IOException("ShaderNodeDefinition file must be loaded via ShaderNodeDefinitionKey");
}
ShaderNodeDefinitionKey key = (ShaderNodeDefinitionKey) k;
loaderDelegate = new ShaderNodeLoaderDelegate();
ShaderNodeDefinitionKey key = (ShaderNodeDefinitionKey) assetKey;
ShaderNodeLoaderDelegate loaderDelegate = new ShaderNodeLoaderDelegate();

InputStream in = assetInfo.openStream();
List<Statement> roots = BlockLanguageParser.parse(in);
Expand All @@ -80,6 +79,5 @@ public Object load(AssetInfo assetInfo) throws IOException {
}

return loaderDelegate.readNodesDefinitions(roots.get(0).getContents(), key);

}
}