sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed formatting thanks to EmpirePhoenix

Browse Source
experimental
michael 10 years ago
parent a59f017710
commit 99d69d1d01
7 changed files with 330 additions and 332 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 26
      jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java
  3. 2
      jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
  4. 1
      jme3-core/src/main/java/com/jme3/renderer/Caps.java
  5. 245
      jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java

2
.gitignore vendored
Unescape View File

@ -131,5 +131,3 @@
!/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib !/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib
!/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so !/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so
!/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so !/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so
*.iml
/.idea/*

26
jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java vendored
Unescape View File

@ -33,7 +33,6 @@ package com.jme3.asset.cache;
import com.jme3.asset.AssetKey; import com.jme3.asset.AssetKey;
import com.jme3.asset.CloneableSmartAsset; import com.jme3.asset.CloneableSmartAsset;
import java.lang.ref.PhantomReference; import java.lang.ref.PhantomReference;
import java.lang.ref.ReferenceQueue; import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -49,7 +48,7 @@ import java.util.logging.Logger;
* when all clones of the original asset are collected, will cause the * when all clones of the original asset are collected, will cause the
* asset to be automatically removed from the cache. * asset to be automatically removed from the cache.
* *
* @author Kirill Vainer * @author Kirill Vainer
*/ */
public class WeakRefCloneAssetCache implements AssetCache { public class WeakRefCloneAssetCache implements AssetCache {
@ -103,16 +102,16 @@ public class WeakRefCloneAssetCache implements AssetCache {
} }
}; };
private void removeCollectedAssets() { private void removeCollectedAssets(){
int removedAssets = 0; int removedAssets = 0;
for (KeyRef ref; (ref = (KeyRef) refQueue.poll()) != null; ) { for (KeyRef ref; (ref = (KeyRef)refQueue.poll()) != null;){
// (Cannot use ref.get() since it was just collected by GC!) // (Cannot use ref.get() since it was just collected by GC!)
AssetKey key = ref.clonedKey; AssetKey key = ref.clonedKey;
// Asset was collected, note that at this point the asset cache // Asset was collected, note that at this point the asset cache
// might not even have this asset anymore, it is OK. // might not even have this asset anymore, it is OK.
if (smartCache.remove(key) != null) { if (smartCache.remove(key) != null){
removedAssets++; removedAssets ++;
//System.out.println("WeakRefAssetCache: The asset " + ref.assetKey + " was purged from the cache"); //System.out.println("WeakRefAssetCache: The asset " + ref.assetKey + " was purged from the cache");
} }
} }
@ -124,6 +123,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
public <T> void addToCache(AssetKey<T> originalKey, T obj) { public <T> void addToCache(AssetKey<T> originalKey, T obj) {
// Make room for new asset // Make room for new asset
removeCollectedAssets(); removeCollectedAssets();
CloneableSmartAsset asset = (CloneableSmartAsset) obj; CloneableSmartAsset asset = (CloneableSmartAsset) obj;
// No circular references, since the original asset is // No circular references, since the original asset is
@ -146,7 +146,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
public <T> void registerAssetClone(AssetKey<T> key, T clone) { public <T> void registerAssetClone(AssetKey<T> key, T clone) {
ArrayList<AssetKey> loadStack = assetLoadStack.get(); ArrayList<AssetKey> loadStack = assetLoadStack.get();
((CloneableSmartAsset) clone).setKey(loadStack.remove(loadStack.size() - 1)); ((CloneableSmartAsset)clone).setKey(loadStack.remove(loadStack.size() - 1));
} }
public void notifyNoAssetClone() { public void notifyNoAssetClone() {
@ -156,7 +156,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
public <T> T getFromCache(AssetKey<T> key) { public <T> T getFromCache(AssetKey<T> key) {
AssetRef smartInfo; AssetRef smartInfo;
synchronized (smartCache) { synchronized (smartCache){
smartInfo = smartCache.get(key); smartInfo = smartCache.get(key);
} }
@ -167,7 +167,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
// can check this and determine that the asset clone // can check this and determine that the asset clone
// belongs to the asset retrieved here. // belongs to the asset retrieved here.
AssetKey keyForTheClone = smartInfo.get(); AssetKey keyForTheClone = smartInfo.get();
if (keyForTheClone == null) { if (keyForTheClone == null){
// The asset was JUST collected by GC // The asset was JUST collected by GC
// (between here and smartCache.get) // (between here and smartCache.get)
return null; return null;
@ -185,9 +185,9 @@ public class WeakRefCloneAssetCache implements AssetCache {
public boolean deleteFromCache(AssetKey key) { public boolean deleteFromCache(AssetKey key) {
ArrayList<AssetKey> loadStack = assetLoadStack.get(); ArrayList<AssetKey> loadStack = assetLoadStack.get();
if (!loadStack.isEmpty()) { if (!loadStack.isEmpty()){
throw new UnsupportedOperationException("Cache cannot be modified" throw new UnsupportedOperationException("Cache cannot be modified"
+ "while assets are being loaded"); + "while assets are being loaded");
} }
return smartCache.remove(key) != null; return smartCache.remove(key) != null;
@ -196,9 +196,9 @@ public class WeakRefCloneAssetCache implements AssetCache {
public void clearCache() { public void clearCache() {
ArrayList<AssetKey> loadStack = assetLoadStack.get(); ArrayList<AssetKey> loadStack = assetLoadStack.get();
if (!loadStack.isEmpty()) { if (!loadStack.isEmpty()){
throw new UnsupportedOperationException("Cache cannot be modified" throw new UnsupportedOperationException("Cache cannot be modified"
+ "while assets are being loaded"); + "while assets are being loaded");
} }
smartCache.clear(); smartCache.clear();

2
jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
Unescape View File

@ -50,8 +50,6 @@ public class TechniqueDef implements Savable {
*/ */
public static final int SAVABLE_VERSION = 1; public static final int SAVABLE_VERSION = 1;
/** /**
* Describes light rendering mode. * Describes light rendering mode.
*/ */

1
jme3-core/src/main/java/com/jme3/renderer/Caps.java
Unescape View File

@ -315,6 +315,7 @@ public enum Caps {
* Supports 32-bit index buffers. * Supports 32-bit index buffers.
*/ */
IntegerIndexBuffer, IntegerIndexBuffer,
/** /**
* Partial support for non-power-of-2 textures, typically found * Partial support for non-power-of-2 textures, typically found
* on OpenGL ES 2 devices. * on OpenGL ES 2 devices.

245
jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
Unescape View File

@ -60,7 +60,7 @@ import java.util.logging.Logger;
public class J3MLoader implements AssetLoader { public class J3MLoader implements AssetLoader {
private static final Logger logger = Logger.getLogger(J3MLoader.class.getName()); private static final Logger logger = Logger.getLogger(J3MLoader.class.getName());
// private ErrorLogger errors; // private ErrorLogger errors;
private ShaderNodeLoaderDelegate nodesLoaderDelegate; private ShaderNodeLoaderDelegate nodesLoaderDelegate;
boolean isUseNodes = false; boolean isUseNodes = false;
@ -107,9 +107,9 @@ public class J3MLoader implements AssetLoader {
} }
// LightMode <MODE> // LightMode <MODE>
private void readLightMode(String statement) throws IOException { private void readLightMode(String statement) throws IOException{
String[] split = statement.split(whitespacePattern); String[] split = statement.split(whitespacePattern);
if (split.length != 2) { if (split.length != 2){
throw new IOException("LightMode statement syntax incorrect"); throw new IOException("LightMode statement syntax incorrect");
} }
LightMode lm = LightMode.valueOf(split[1]); LightMode lm = LightMode.valueOf(split[1]);
@ -117,29 +117,29 @@ public class J3MLoader implements AssetLoader {
} }
// ShadowMode <MODE> // ShadowMode <MODE>
private void readShadowMode(String statement) throws IOException { private void readShadowMode(String statement) throws IOException{
String[] split = statement.split(whitespacePattern); String[] split = statement.split(whitespacePattern);
if (split.length != 2) { if (split.length != 2){
throw new IOException("ShadowMode statement syntax incorrect"); throw new IOException("ShadowMode statement syntax incorrect");
} }
ShadowMode sm = ShadowMode.valueOf(split[1]); ShadowMode sm = ShadowMode.valueOf(split[1]);
technique.setShadowMode(sm); technique.setShadowMode(sm);
} }
private Object readValue(VarType type, String value) throws IOException { private Object readValue(VarType type, String value) throws IOException{
if (type.isTextureType()) { if (type.isTextureType()){
// String texturePath = readString("[\n;(//)(\\})]"); // String texturePath = readString("[\n;(//)(\\})]");
String texturePath = value.trim(); String texturePath = value.trim();
boolean flipY = false; boolean flipY = false;
boolean repeat = false; boolean repeat = false;
if (texturePath.startsWith("Flip Repeat ")) { if (texturePath.startsWith("Flip Repeat ")){
texturePath = texturePath.substring(12).trim(); texturePath = texturePath.substring(12).trim();
flipY = true; flipY = true;
repeat = true; repeat = true;
} else if (texturePath.startsWith("Flip ")) { }else if (texturePath.startsWith("Flip ")){
texturePath = texturePath.substring(5).trim(); texturePath = texturePath.substring(5).trim();
flipY = true; flipY = true;
} else if (texturePath.startsWith("Repeat ")) { }else if (texturePath.startsWith("Repeat ")){
texturePath = texturePath.substring(7).trim(); texturePath = texturePath.substring(7).trim();
repeat = true; repeat = true;
} }
@ -161,69 +161,69 @@ public class J3MLoader implements AssetLoader {
Texture tex; Texture tex;
try { try {
tex = assetManager.loadTexture(texKey); tex = assetManager.loadTexture(texKey);
} catch (AssetNotFoundException ex) { } catch (AssetNotFoundException ex){
logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key}); logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
tex = null; tex = null;
} }
if (tex != null) { if (tex != null){
if (repeat) { if (repeat){
tex.setWrap(WrapMode.Repeat); tex.setWrap(WrapMode.Repeat);
} }
} else { }else{
tex = new Texture2D(PlaceholderAssets.getPlaceholderImage(assetManager)); tex = new Texture2D(PlaceholderAssets.getPlaceholderImage(assetManager));
if (repeat) { if (repeat){
tex.setWrap(WrapMode.Repeat); tex.setWrap(WrapMode.Repeat);
} }
tex.setKey(texKey); tex.setKey(texKey);
} }
return tex; return tex;
} else { }else{
String[] split = value.trim().split(whitespacePattern); String[] split = value.trim().split(whitespacePattern);
switch (type) { switch (type){
case Float: case Float:
if (split.length != 1) { if (split.length != 1){
throw new IOException("Float value parameter must have 1 entry: " + value); throw new IOException("Float value parameter must have 1 entry: " + value);
} }
return Float.parseFloat(split[0]); return Float.parseFloat(split[0]);
case Vector2: case Vector2:
if (split.length != 2) { if (split.length != 2){
throw new IOException("Vector2 value parameter must have 2 entries: " + value); throw new IOException("Vector2 value parameter must have 2 entries: " + value);
} }
return new Vector2f(Float.parseFloat(split[0]), return new Vector2f(Float.parseFloat(split[0]),
Float.parseFloat(split[1])); Float.parseFloat(split[1]));
case Vector3: case Vector3:
if (split.length != 3) { if (split.length != 3){
throw new IOException("Vector3 value parameter must have 3 entries: " + value); throw new IOException("Vector3 value parameter must have 3 entries: " + value);
} }
return new Vector3f(Float.parseFloat(split[0]), return new Vector3f(Float.parseFloat(split[0]),
Float.parseFloat(split[1]), Float.parseFloat(split[1]),
Float.parseFloat(split[2])); Float.parseFloat(split[2]));
case Vector4: case Vector4:
if (split.length != 4) { if (split.length != 4){
throw new IOException("Vector4 value parameter must have 4 entries: " + value); throw new IOException("Vector4 value parameter must have 4 entries: " + value);
} }
return new ColorRGBA(Float.parseFloat(split[0]), return new ColorRGBA(Float.parseFloat(split[0]),
Float.parseFloat(split[1]), Float.parseFloat(split[1]),
Float.parseFloat(split[2]), Float.parseFloat(split[2]),
Float.parseFloat(split[3])); Float.parseFloat(split[3]));
case Int: case Int:
if (split.length != 1) { if (split.length != 1){
throw new IOException("Int value parameter must have 1 entry: " + value); throw new IOException("Int value parameter must have 1 entry: " + value);
} }
return Integer.parseInt(split[0]); return Integer.parseInt(split[0]);
case Boolean: case Boolean:
if (split.length != 1) { if (split.length != 1){
throw new IOException("Boolean value parameter must have 1 entry: " + value); throw new IOException("Boolean value parameter must have 1 entry: " + value);
} }
return Boolean.parseBoolean(split[0]); return Boolean.parseBoolean(split[0]);
default: default:
throw new UnsupportedOperationException("Unknown type: " + type); throw new UnsupportedOperationException("Unknown type: "+type);
} }
} }
} }
// <TYPE> <NAME> [ "(" <FFBINDING> ")" ] [ ":" <DEFAULTVAL> ] [-LINEAR] // <TYPE> <NAME> [ "(" <FFBINDING> ")" ] [-LINEAR] [ ":" <DEFAULTVAL> ]
private void readParam(String statement) throws IOException { private void readParam(String statement) throws IOException{
String name; String name;
String defaultVal = null; String defaultVal = null;
ColorSpace colorSpace = null; ColorSpace colorSpace = null;
@ -231,15 +231,16 @@ public class J3MLoader implements AssetLoader {
String[] split = statement.split(":"); String[] split = statement.split(":");
// Parse default val // Parse default val
if (split.length == 1) { if (split.length == 1){
// Doesn't contain default value // Doesn't contain default value
} else { }else{
if (split.length != 2) { if (split.length != 2){
throw new IOException("Parameter statement syntax incorrect"); throw new IOException("Parameter statement syntax incorrect");
} }
statement = split[0].trim(); statement = split[0].trim();
defaultVal = split[1].trim(); defaultVal = split[1].trim();
} }
if (statement.endsWith("-LINEAR")) { if (statement.endsWith("-LINEAR")) {
colorSpace = ColorSpace.Linear; colorSpace = ColorSpace.Linear;
statement = statement.substring(0, statement.length() - "-LINEAR".length()); statement = statement.substring(0, statement.length() - "-LINEAR".length());
@ -247,137 +248,137 @@ public class J3MLoader implements AssetLoader {
// Parse ffbinding // Parse ffbinding
int startParen = statement.indexOf("("); int startParen = statement.indexOf("(");
if (startParen != -1) { if (startParen != -1){
// get content inside parentheses // get content inside parentheses
int endParen = statement.indexOf(")", startParen); int endParen = statement.indexOf(")", startParen);
String bindingStr = statement.substring(startParen + 1, endParen).trim(); String bindingStr = statement.substring(startParen+1, endParen).trim();
// don't care about bindingStr // don't care about bindingStr
statement = statement.substring(0, startParen); statement = statement.substring(0, startParen);
} }
// Parse type + name // Parse type + name
split = statement.split(whitespacePattern); split = statement.split(whitespacePattern);
if (split.length != 2) { if (split.length != 2){
throw new IOException("Parameter statement syntax incorrect"); throw new IOException("Parameter statement syntax incorrect");
} }
VarType type; VarType type;
if (split[0].equals("Color")) { if (split[0].equals("Color")){
type = VarType.Vector4; type = VarType.Vector4;
} else { }else{
type = VarType.valueOf(split[0]); type = VarType.valueOf(split[0]);
} }
name = split[1]; name = split[1];
Object defaultValObj = null; Object defaultValObj = null;
if (defaultVal != null) { if (defaultVal != null){
defaultValObj = readValue(type, defaultVal); defaultValObj = readValue(type, defaultVal);
} }
if (type.isTextureType()) { if(type.isTextureType()){
materialDef.addMaterialParamTexture(type, name, colorSpace); materialDef.addMaterialParamTexture(type, name, colorSpace);
} else { }else{
materialDef.addMaterialParam(type, name, defaultValObj); materialDef.addMaterialParam(type, name, defaultValObj);
} }
} }
private void readValueParam(String statement) throws IOException { private void readValueParam(String statement) throws IOException{
// Use limit=1 incase filename contains colons // Use limit=1 incase filename contains colons
String[] split = statement.split(":", 2); String[] split = statement.split(":", 2);
if (split.length != 2) { if (split.length != 2){
throw new IOException("Value parameter statement syntax incorrect"); throw new IOException("Value parameter statement syntax incorrect");
} }
String name = split[0].trim(); String name = split[0].trim();
// parse value // parse value
MatParam p = material.getMaterialDef().getMaterialParam(name); MatParam p = material.getMaterialDef().getMaterialParam(name);
if (p == null) { if (p == null){
throw new IOException("The material parameter: " + name + " is undefined."); throw new IOException("The material parameter: "+name+" is undefined.");
} }
Object valueObj = readValue(p.getVarType(), split[1]); Object valueObj = readValue(p.getVarType(), split[1]);
if (p.getVarType().isTextureType()) { if (p.getVarType().isTextureType()){
material.setTextureParam(name, p.getVarType(), (Texture) valueObj); material.setTextureParam(name, p.getVarType(), (Texture) valueObj);
} else { }else{
material.setParam(name, p.getVarType(), valueObj); material.setParam(name, p.getVarType(), valueObj);
} }
} }
private void readMaterialParams(List<Statement> paramsList) throws IOException { private void readMaterialParams(List<Statement> paramsList) throws IOException{
for (Statement statement : paramsList) { for (Statement statement : paramsList){
readParam(statement.getLine()); readParam(statement.getLine());
} }
} }
private void readExtendingMaterialParams(List<Statement> paramsList) throws IOException { private void readExtendingMaterialParams(List<Statement> paramsList) throws IOException{
for (Statement statement : paramsList) { for (Statement statement : paramsList){
readValueParam(statement.getLine()); readValueParam(statement.getLine());
} }
} }
private void readWorldParams(List<Statement> worldParams) throws IOException { private void readWorldParams(List<Statement> worldParams) throws IOException{
for (Statement statement : worldParams) { for (Statement statement : worldParams){
technique.addWorldParam(statement.getLine()); technique.addWorldParam(statement.getLine());
} }
} }
private boolean parseBoolean(String word) { private boolean parseBoolean(String word){
return word != null && word.equals("On"); return word != null && word.equals("On");
} }
private void readRenderStateStatement(Statement statement) throws IOException { private void readRenderStateStatement(Statement statement) throws IOException{
String[] split = statement.getLine().split(whitespacePattern); String[] split = statement.getLine().split(whitespacePattern);
if (split[0].equals("Wireframe")) { if (split[0].equals("Wireframe")){
renderState.setWireframe(parseBoolean(split[1])); renderState.setWireframe(parseBoolean(split[1]));
} else if (split[0].equals("FaceCull")) { }else if (split[0].equals("FaceCull")){
renderState.setFaceCullMode(FaceCullMode.valueOf(split[1])); renderState.setFaceCullMode(FaceCullMode.valueOf(split[1]));
} else if (split[0].equals("DepthWrite")) { }else if (split[0].equals("DepthWrite")){
renderState.setDepthWrite(parseBoolean(split[1])); renderState.setDepthWrite(parseBoolean(split[1]));
} else if (split[0].equals("DepthTest")) { }else if (split[0].equals("DepthTest")){
renderState.setDepthTest(parseBoolean(split[1])); renderState.setDepthTest(parseBoolean(split[1]));
} else if (split[0].equals("Blend")) { }else if (split[0].equals("Blend")){
renderState.setBlendMode(BlendMode.valueOf(split[1])); renderState.setBlendMode(BlendMode.valueOf(split[1]));
} else if (split[0].equals("AlphaTestFalloff")) { }else if (split[0].equals("AlphaTestFalloff")){
renderState.setAlphaTest(true); renderState.setAlphaTest(true);
renderState.setAlphaFallOff(Float.parseFloat(split[1])); renderState.setAlphaFallOff(Float.parseFloat(split[1]));
} else if (split[0].equals("PolyOffset")) { }else if (split[0].equals("PolyOffset")){
float factor = Float.parseFloat(split[1]); float factor = Float.parseFloat(split[1]);
float units = Float.parseFloat(split[2]); float units = Float.parseFloat(split[2]);
renderState.setPolyOffset(factor, units); renderState.setPolyOffset(factor, units);
} else if (split[0].equals("ColorWrite")) { }else if (split[0].equals("ColorWrite")){
renderState.setColorWrite(parseBoolean(split[1])); renderState.setColorWrite(parseBoolean(split[1]));
} else if (split[0].equals("PointSprite")) { }else if (split[0].equals("PointSprite")){
renderState.setPointSprite(parseBoolean(split[1])); renderState.setPointSprite(parseBoolean(split[1]));
} else if (split[0].equals("DepthFunc")) { }else if (split[0].equals("DepthFunc")){
renderState.setDepthFunc(RenderState.TestFunction.valueOf(split[1])); renderState.setDepthFunc(RenderState.TestFunction.valueOf(split[1]));
} else if (split[0].equals("AlphaFunc")) { }else if (split[0].equals("AlphaFunc")){
renderState.setAlphaFunc(RenderState.TestFunction.valueOf(split[1])); renderState.setAlphaFunc(RenderState.TestFunction.valueOf(split[1]));
} else { } else {
throw new MatParseException(null, split[0], statement); throw new MatParseException(null, split[0], statement);
} }
} }
private void readAdditionalRenderState(List<Statement> renderStates) throws IOException { private void readAdditionalRenderState(List<Statement> renderStates) throws IOException{
renderState = material.getAdditionalRenderState(); renderState = material.getAdditionalRenderState();
for (Statement statement : renderStates) { for (Statement statement : renderStates){
readRenderStateStatement(statement); readRenderStateStatement(statement);
} }
renderState = null; renderState = null;
} }
private void readRenderState(List<Statement> renderStates) throws IOException { private void readRenderState(List<Statement> renderStates) throws IOException{
renderState = new RenderState(); renderState = new RenderState();
for (Statement statement : renderStates) { for (Statement statement : renderStates){
readRenderStateStatement(statement); readRenderStateStatement(statement);
} }
technique.setRenderState(renderState); technique.setRenderState(renderState);
renderState = null; renderState = null;
} }
private void readForcedRenderState(List<Statement> renderStates) throws IOException { private void readForcedRenderState(List<Statement> renderStates) throws IOException{
renderState = new RenderState(); renderState = new RenderState();
for (Statement statement : renderStates) { for (Statement statement : renderStates){
readRenderStateStatement(statement); readRenderStateStatement(statement);
} }
technique.setForcedRenderState(renderState); technique.setForcedRenderState(renderState);
@ -385,26 +386,26 @@ public class J3MLoader implements AssetLoader {
} }
// <DEFINENAME> [ ":" <PARAMNAME> ] // <DEFINENAME> [ ":" <PARAMNAME> ]
private void readDefine(String statement) throws IOException { private void readDefine(String statement) throws IOException{
String[] split = statement.split(":"); String[] split = statement.split(":");
if (split.length == 1) { if (split.length == 1){
// add preset define // add preset define
technique.addShaderPresetDefine(split[0].trim(), VarType.Boolean, true); technique.addShaderPresetDefine(split[0].trim(), VarType.Boolean, true);
} else if (split.length == 2) { }else if (split.length == 2){
technique.addShaderParamDefine(split[1].trim(), split[0].trim()); technique.addShaderParamDefine(split[1].trim(), split[0].trim());
} else { }else{
throw new IOException("Define syntax incorrect"); throw new IOException("Define syntax incorrect");
} }
} }
private void readDefines(List<Statement> defineList) throws IOException { private void readDefines(List<Statement> defineList) throws IOException{
for (Statement statement : defineList) { for (Statement statement : defineList){
readDefine(statement.getLine()); readDefine(statement.getLine());
} }
} }
private void readTechniqueStatement(Statement statement) throws IOException { private void readTechniqueStatement(Statement statement) throws IOException{
String[] split = statement.getLine().split("[ \\{]"); String[] split = statement.getLine().split("[ \\{]");
if (split[0].equals("VertexShader") || if (split[0].equals("VertexShader") ||
split[0].equals("FragmentShader") || split[0].equals("FragmentShader") ||
@ -412,17 +413,17 @@ public class J3MLoader implements AssetLoader {
split[0].equals("TessellationControlShader") || split[0].equals("TessellationControlShader") ||
split[0].equals("TessellationEvaluationShader")) { split[0].equals("TessellationEvaluationShader")) {
readShaderStatement(statement.getLine()); readShaderStatement(statement.getLine());
} else if (split[0].equals("LightMode")) { }else if (split[0].equals("LightMode")){
readLightMode(statement.getLine()); readLightMode(statement.getLine());
} else if (split[0].equals("ShadowMode")) { }else if (split[0].equals("ShadowMode")){
readShadowMode(statement.getLine()); readShadowMode(statement.getLine());
} else if (split[0].equals("WorldParameters")) { }else if (split[0].equals("WorldParameters")){
readWorldParams(statement.getContents()); readWorldParams(statement.getContents());
} else if (split[0].equals("RenderState")) { }else if (split[0].equals("RenderState")){
readRenderState(statement.getContents()); readRenderState(statement.getContents());
} else if (split[0].equals("ForcedRenderState")) { }else if (split[0].equals("ForcedRenderState")){
readForcedRenderState(statement.getContents()); readForcedRenderState(statement.getContents());
} else if (split[0].equals("Defines")) { }else if (split[0].equals("Defines")){
readDefines(statement.getContents()); readDefines(statement.getContents());
} else if (split[0].equals("ShaderNodesDefinitions")) { } else if (split[0].equals("ShaderNodesDefinitions")) {
initNodesLoader(); initNodesLoader();
@ -444,15 +445,15 @@ public class J3MLoader implements AssetLoader {
} }
} }
private void readTransparentStatement(String statement) throws IOException { private void readTransparentStatement(String statement) throws IOException{
String[] split = statement.split(whitespacePattern); String[] split = statement.split(whitespacePattern);
if (split.length != 2) { if (split.length != 2){
throw new IOException("Transparent statement syntax incorrect"); throw new IOException("Transparent statement syntax incorrect");
} }
material.setTransparent(parseBoolean(split[1])); material.setTransparent(parseBoolean(split[1]));
} }
private void readTechnique(Statement techStat) throws IOException { private void readTechnique(Statement techStat) throws IOException{
isUseNodes = false; isUseNodes = false;
String[] split = techStat.getLine().split(whitespacePattern); String[] split = techStat.getLine().split(whitespacePattern);
if (split.length == 1) { if (split.length == 1) {
@ -464,11 +465,11 @@ public class J3MLoader implements AssetLoader {
throw new IOException("Technique statement syntax incorrect"); throw new IOException("Technique statement syntax incorrect");
} }
for (Statement statement : techStat.getContents()) { for (Statement statement : techStat.getContents()){
readTechniqueStatement(statement); readTechniqueStatement(statement);
} }
if (isUseNodes) { if(isUseNodes){
nodesLoaderDelegate.computeConditions(); nodesLoaderDelegate.computeConditions();
//used for caching later, the shader here is not a file. //used for caching later, the shader here is not a file.
technique.setShaderFile(technique.hashCode() + "", technique.hashCode() + "", "GLSL100", "GLSL100"); technique.setShaderFile(technique.hashCode() + "", technique.hashCode() + "", "GLSL100", "GLSL100");
@ -484,40 +485,40 @@ public class J3MLoader implements AssetLoader {
shaderName.clear(); shaderName.clear();
} }
private void loadFromRoot(List<Statement> roots) throws IOException { private void loadFromRoot(List<Statement> roots) throws IOException{
if (roots.size() == 2) { if (roots.size() == 2){
Statement exception = roots.get(0); Statement exception = roots.get(0);
String line = exception.getLine(); String line = exception.getLine();
if (line.startsWith("Exception")) { if (line.startsWith("Exception")){
throw new AssetLoadException(line.substring("Exception ".length())); throw new AssetLoadException(line.substring("Exception ".length()));
} else { }else{
throw new IOException("In multiroot material, expected first statement to be 'Exception'"); throw new IOException("In multiroot material, expected first statement to be 'Exception'");
} }
} else if (roots.size() != 1) { }else if (roots.size() != 1){
throw new IOException("Too many roots in J3M/J3MD file"); throw new IOException("Too many roots in J3M/J3MD file");
} }
boolean extending = false; boolean extending = false;
Statement materialStat = roots.get(0); Statement materialStat = roots.get(0);
String materialName = materialStat.getLine(); String materialName = materialStat.getLine();
if (materialName.startsWith("MaterialDef")) { if (materialName.startsWith("MaterialDef")){
materialName = materialName.substring("MaterialDef ".length()).trim(); materialName = materialName.substring("MaterialDef ".length()).trim();
extending = false; extending = false;
} else if (materialName.startsWith("Material")) { }else if (materialName.startsWith("Material")){
materialName = materialName.substring("Material ".length()).trim(); materialName = materialName.substring("Material ".length()).trim();
extending = true; extending = true;
} else { }else{
throw new IOException("Specified file is not a Material file"); throw new IOException("Specified file is not a Material file");
} }
String[] split = materialName.split(":", 2); String[] split = materialName.split(":", 2);
if (materialName.equals("")) { if (materialName.equals("")){
throw new MatParseException("Material name cannot be empty", materialStat); throw new MatParseException("Material name cannot be empty", materialStat);
} }
if (split.length == 2) { if (split.length == 2){
if (!extending) { if (!extending){
throw new MatParseException("Must use 'Material' when extending.", materialStat); throw new MatParseException("Must use 'Material' when extending.", materialStat);
} }
@ -531,35 +532,35 @@ public class J3MLoader implements AssetLoader {
material = new Material(def); material = new Material(def);
material.setKey(key); material.setKey(key);
// material.setAssetName(fileName); // material.setAssetName(fileName);
} else if (split.length == 1) { }else if (split.length == 1){
if (extending) { if (extending){
throw new MatParseException("Expected ':', got '{'", materialStat); throw new MatParseException("Expected ':', got '{'", materialStat);
} }
materialDef = new MaterialDef(assetManager, materialName); materialDef = new MaterialDef(assetManager, materialName);
// NOTE: pass file name for defs so they can be loaded later // NOTE: pass file name for defs so they can be loaded later
materialDef.setAssetName(key.getName()); materialDef.setAssetName(key.getName());
} else { }else{
throw new MatParseException("Cannot use colon in material name/path", materialStat); throw new MatParseException("Cannot use colon in material name/path", materialStat);
} }
for (Statement statement : materialStat.getContents()) { for (Statement statement : materialStat.getContents()){
split = statement.getLine().split("[ \\{]"); split = statement.getLine().split("[ \\{]");
String statType = split[0]; String statType = split[0];
if (extending) { if (extending){
if (statType.equals("MaterialParameters")) { if (statType.equals("MaterialParameters")){
readExtendingMaterialParams(statement.getContents()); readExtendingMaterialParams(statement.getContents());
} else if (statType.equals("AdditionalRenderState")) { }else if (statType.equals("AdditionalRenderState")){
readAdditionalRenderState(statement.getContents()); readAdditionalRenderState(statement.getContents());
} else if (statType.equals("Transparent")) { }else if (statType.equals("Transparent")){
readTransparentStatement(statement.getLine()); readTransparentStatement(statement.getLine());
} }
} else { }else{
if (statType.equals("Technique")) { if (statType.equals("Technique")){
readTechnique(statement); readTechnique(statement);
} else if (statType.equals("MaterialParameters")) { }else if (statType.equals("MaterialParameters")){
readMaterialParams(statement.getContents()); readMaterialParams(statement.getContents());
} else { }else{
throw new MatParseException("Expected material statement, got '" + statType + "'", statement); throw new MatParseException("Expected material statement, got '"+statType+"'", statement);
} }
} }
} }
@ -573,18 +574,18 @@ public class J3MLoader implements AssetLoader {
key = info.getKey(); key = info.getKey();
loadFromRoot(BlockLanguageParser.parse(in)); loadFromRoot(BlockLanguageParser.parse(in));
} finally { } finally {
if (in != null) { if (in != null){
in.close(); in.close();
} }
} }
if (material != null) { if (material != null){
if (!(info.getKey() instanceof MaterialKey)) { if (!(info.getKey() instanceof MaterialKey)){
throw new IOException("Material instances must be loaded via MaterialKey"); throw new IOException("Material instances must be loaded via MaterialKey");
} }
// material implementation // material implementation
return material; return material;
} else { }else{
// material definition // material definition
return materialDef; return materialDef;
} }
@ -603,7 +604,7 @@ public class J3MLoader implements AssetLoader {
if (isUseNodes) { if (isUseNodes) {
if (nodesLoaderDelegate == null) { if (nodesLoaderDelegate == null) {
nodesLoaderDelegate = new ShaderNodeLoaderDelegate(); nodesLoaderDelegate = new ShaderNodeLoaderDelegate();
} else { }else{
nodesLoaderDelegate.clear(); nodesLoaderDelegate.clear();
} }
nodesLoaderDelegate.setTechniqueDef(technique); nodesLoaderDelegate.setTechniqueDef(technique);

Write Preview
Loading…
Cancel
Save