Fixed uploading of all shader stages
This commit is contained in:
michael
parent
46a48f466d
commit
1ad8ff154c
@ -393,6 +393,7 @@ public class DesktopAssetManager implements AssetManager {
|
||||
public Shader loadShader(ShaderKey key){
|
||||
// cache abuse in method
|
||||
// that doesn't use loaders/locators
|
||||
System.out.println();
|
||||
AssetCache cache = handler.getCache(SimpleAssetCache.class);
|
||||
Shader shader = (Shader) cache.getFromCache(key);
|
||||
if (shader == null){
|
||||
@ -402,17 +403,11 @@ public class DesktopAssetManager implements AssetManager {
|
||||
}
|
||||
shader = shaderGenerator.generateShader();
|
||||
} else {
|
||||
|
||||
String vertName = key.getVertName();
|
||||
String fragName = key.getFragName();
|
||||
|
||||
String vertSource = (String) loadAsset(new AssetKey(vertName));
|
||||
String fragSource = (String) loadAsset(new AssetKey(fragName));
|
||||
|
||||
shader = new Shader();
|
||||
shader.initialize();
|
||||
shader.addSource(Shader.ShaderType.Vertex, vertName, vertSource, key.getDefines().getCompiled(), key.getVertexShaderLanguage());
|
||||
shader.addSource(Shader.ShaderType.Fragment, fragName, fragSource, key.getDefines().getCompiled(), key.getFragmentShaderLanguage());
|
||||
for (Shader.ShaderType shaderType : key.getUsedShaderPrograms()) {
|
||||
shader.addSource(shaderType,key.getShaderProgramName(shaderType),(String) loadAsset(new AssetKey(key.getShaderProgramName(shaderType))),key.getDefines().getCompiled(),key.getShaderProgramLanguage(shaderType));
|
||||
}
|
||||
}
|
||||
|
||||
cache.addToCache(key, shader);
|
||||
|
||||
@ -33,6 +33,7 @@ package com.jme3.asset.cache;
|
||||
|
||||
import com.jme3.asset.AssetKey;
|
||||
import com.jme3.asset.CloneableSmartAsset;
|
||||
|
||||
import java.lang.ref.PhantomReference;
|
||||
import java.lang.ref.ReferenceQueue;
|
||||
import java.lang.ref.WeakReference;
|
||||
@ -48,7 +49,7 @@ import java.util.logging.Logger;
|
||||
* when all clones of the original asset are collected, will cause the
|
||||
* asset to be automatically removed from the cache.
|
||||
*
|
||||
* @author Kirill Vainer
|
||||
* @author Kirill Vainer
|
||||
*/
|
||||
public class WeakRefCloneAssetCache implements AssetCache {
|
||||
|
||||
@ -102,16 +103,16 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
}
|
||||
};
|
||||
|
||||
private void removeCollectedAssets(){
|
||||
private void removeCollectedAssets() {
|
||||
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!)
|
||||
AssetKey key = ref.clonedKey;
|
||||
|
||||
// Asset was collected, note that at this point the asset cache
|
||||
// might not even have this asset anymore, it is OK.
|
||||
if (smartCache.remove(key) != null){
|
||||
removedAssets ++;
|
||||
if (smartCache.remove(key) != null) {
|
||||
removedAssets++;
|
||||
//System.out.println("WeakRefAssetCache: The asset " + ref.assetKey + " was purged from the cache");
|
||||
}
|
||||
}
|
||||
@ -123,7 +124,6 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
public <T> void addToCache(AssetKey<T> originalKey, T obj) {
|
||||
// Make room for new asset
|
||||
removeCollectedAssets();
|
||||
|
||||
CloneableSmartAsset asset = (CloneableSmartAsset) obj;
|
||||
|
||||
// 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) {
|
||||
ArrayList<AssetKey> loadStack = assetLoadStack.get();
|
||||
((CloneableSmartAsset)clone).setKey(loadStack.remove(loadStack.size() - 1));
|
||||
((CloneableSmartAsset) clone).setKey(loadStack.remove(loadStack.size() - 1));
|
||||
}
|
||||
|
||||
public void notifyNoAssetClone() {
|
||||
@ -156,7 +156,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
|
||||
public <T> T getFromCache(AssetKey<T> key) {
|
||||
AssetRef smartInfo;
|
||||
synchronized (smartCache){
|
||||
synchronized (smartCache) {
|
||||
smartInfo = smartCache.get(key);
|
||||
}
|
||||
|
||||
@ -167,7 +167,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
// can check this and determine that the asset clone
|
||||
// belongs to the asset retrieved here.
|
||||
AssetKey keyForTheClone = smartInfo.get();
|
||||
if (keyForTheClone == null){
|
||||
if (keyForTheClone == null) {
|
||||
// The asset was JUST collected by GC
|
||||
// (between here and smartCache.get)
|
||||
return null;
|
||||
@ -185,7 +185,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
public boolean deleteFromCache(AssetKey key) {
|
||||
ArrayList<AssetKey> loadStack = assetLoadStack.get();
|
||||
|
||||
if (!loadStack.isEmpty()){
|
||||
if (!loadStack.isEmpty()) {
|
||||
throw new UnsupportedOperationException("Cache cannot be modified"
|
||||
+ "while assets are being loaded");
|
||||
}
|
||||
@ -196,7 +196,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
|
||||
public void clearCache() {
|
||||
ArrayList<AssetKey> loadStack = assetLoadStack.get();
|
||||
|
||||
if (!loadStack.isEmpty()){
|
||||
if (!loadStack.isEmpty()) {
|
||||
throw new UnsupportedOperationException("Cache cannot be modified"
|
||||
+ "while assets are being loaded");
|
||||
}
|
||||
|
||||
@ -38,6 +38,7 @@ import com.jme3.export.JmeImporter;
|
||||
import com.jme3.export.OutputCapsule;
|
||||
import java.io.IOException;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Set;
|
||||
|
||||
public class ShaderKey extends AssetKey<Shader> {
|
||||
|
||||
@ -141,6 +142,18 @@ public class ShaderKey extends AssetKey<Shader> {
|
||||
this.usesShaderNodes = usesShaderNodes;
|
||||
}
|
||||
|
||||
public Set<Shader.ShaderType> getUsedShaderPrograms(){
|
||||
return shaderName.keySet();
|
||||
}
|
||||
|
||||
public String getShaderProgramLanguage(Shader.ShaderType shaderType){
|
||||
return shaderLanguage.get(shaderType);
|
||||
}
|
||||
|
||||
public String getShaderProgramName(Shader.ShaderType shaderType){
|
||||
return shaderName.get(shaderType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(JmeExporter ex) throws IOException{
|
||||
super.write(ex);
|
||||
|
||||
@ -49,6 +49,7 @@ import com.jme3.texture.image.ColorSpace;
|
||||
import com.jme3.util.PlaceholderAssets;
|
||||
import com.jme3.util.blockparser.BlockLanguageParser;
|
||||
import com.jme3.util.blockparser.Statement;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.EnumMap;
|
||||
@ -71,14 +72,14 @@ public class J3MLoader implements AssetLoader {
|
||||
private TechniqueDef technique;
|
||||
private RenderState renderState;
|
||||
|
||||
private EnumMap<Shader.ShaderType,String> shaderLanguage;
|
||||
private EnumMap<Shader.ShaderType,String> shaderName;
|
||||
private EnumMap<Shader.ShaderType, String> shaderLanguage;
|
||||
private EnumMap<Shader.ShaderType, String> shaderName;
|
||||
|
||||
private static final String whitespacePattern = "\\p{javaWhitespace}+";
|
||||
|
||||
public J3MLoader(){
|
||||
shaderLanguage=new EnumMap<Shader.ShaderType, String>(Shader.ShaderType.class);
|
||||
shaderName=new EnumMap<Shader.ShaderType, String>(Shader.ShaderType.class);
|
||||
public J3MLoader() {
|
||||
shaderLanguage = new EnumMap<Shader.ShaderType, String>(Shader.ShaderType.class);
|
||||
shaderName = new EnumMap<Shader.ShaderType, String>(Shader.ShaderType.class);
|
||||
}
|
||||
|
||||
|
||||
@ -94,21 +95,21 @@ public class J3MLoader implements AssetLoader {
|
||||
}
|
||||
|
||||
for (Shader.ShaderType shaderType : Shader.ShaderType.values()) {
|
||||
if(typeAndLang[0].equals(shaderType.toString()+"Shader")){
|
||||
readShaderDefinition(shaderType,split[1].trim(),typeAndLang[1]);
|
||||
if (typeAndLang[0].equals(shaderType.toString() + "Shader")) {
|
||||
readShaderDefinition(shaderType, split[1].trim(), typeAndLang[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void readShaderDefinition(Shader.ShaderType shaderType,String name,String language){
|
||||
shaderName.put(shaderType,name);
|
||||
shaderLanguage.put(shaderType,language);
|
||||
private void readShaderDefinition(Shader.ShaderType shaderType, String name, String language) {
|
||||
shaderName.put(shaderType, name);
|
||||
shaderLanguage.put(shaderType, language);
|
||||
}
|
||||
|
||||
// LightMode <MODE>
|
||||
private void readLightMode(String statement) throws IOException{
|
||||
private void readLightMode(String statement) throws IOException {
|
||||
String[] split = statement.split(whitespacePattern);
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("LightMode statement syntax incorrect");
|
||||
}
|
||||
LightMode lm = LightMode.valueOf(split[1]);
|
||||
@ -116,29 +117,29 @@ public class J3MLoader implements AssetLoader {
|
||||
}
|
||||
|
||||
// ShadowMode <MODE>
|
||||
private void readShadowMode(String statement) throws IOException{
|
||||
private void readShadowMode(String statement) throws IOException {
|
||||
String[] split = statement.split(whitespacePattern);
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("ShadowMode statement syntax incorrect");
|
||||
}
|
||||
ShadowMode sm = ShadowMode.valueOf(split[1]);
|
||||
technique.setShadowMode(sm);
|
||||
}
|
||||
|
||||
private Object readValue(VarType type, String value) throws IOException{
|
||||
if (type.isTextureType()){
|
||||
private Object readValue(VarType type, String value) throws IOException {
|
||||
if (type.isTextureType()) {
|
||||
// String texturePath = readString("[\n;(//)(\\})]");
|
||||
String texturePath = value.trim();
|
||||
boolean flipY = false;
|
||||
boolean repeat = false;
|
||||
if (texturePath.startsWith("Flip Repeat ")){
|
||||
if (texturePath.startsWith("Flip Repeat ")) {
|
||||
texturePath = texturePath.substring(12).trim();
|
||||
flipY = true;
|
||||
repeat = true;
|
||||
}else if (texturePath.startsWith("Flip ")){
|
||||
} else if (texturePath.startsWith("Flip ")) {
|
||||
texturePath = texturePath.substring(5).trim();
|
||||
flipY = true;
|
||||
}else if (texturePath.startsWith("Repeat ")){
|
||||
} else if (texturePath.startsWith("Repeat ")) {
|
||||
texturePath = texturePath.substring(7).trim();
|
||||
repeat = true;
|
||||
}
|
||||
@ -160,45 +161,45 @@ public class J3MLoader implements AssetLoader {
|
||||
Texture tex;
|
||||
try {
|
||||
tex = assetManager.loadTexture(texKey);
|
||||
} catch (AssetNotFoundException ex){
|
||||
} catch (AssetNotFoundException ex) {
|
||||
logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
|
||||
tex = null;
|
||||
}
|
||||
if (tex != null){
|
||||
if (repeat){
|
||||
if (tex != null) {
|
||||
if (repeat) {
|
||||
tex.setWrap(WrapMode.Repeat);
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
tex = new Texture2D(PlaceholderAssets.getPlaceholderImage(assetManager));
|
||||
if (repeat){
|
||||
if (repeat) {
|
||||
tex.setWrap(WrapMode.Repeat);
|
||||
}
|
||||
tex.setKey(texKey);
|
||||
}
|
||||
return tex;
|
||||
}else{
|
||||
} else {
|
||||
String[] split = value.trim().split(whitespacePattern);
|
||||
switch (type){
|
||||
switch (type) {
|
||||
case Float:
|
||||
if (split.length != 1){
|
||||
if (split.length != 1) {
|
||||
throw new IOException("Float value parameter must have 1 entry: " + value);
|
||||
}
|
||||
return Float.parseFloat(split[0]);
|
||||
case Vector2:
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("Vector2 value parameter must have 2 entries: " + value);
|
||||
}
|
||||
return new Vector2f(Float.parseFloat(split[0]),
|
||||
Float.parseFloat(split[1]));
|
||||
case Vector3:
|
||||
if (split.length != 3){
|
||||
if (split.length != 3) {
|
||||
throw new IOException("Vector3 value parameter must have 3 entries: " + value);
|
||||
}
|
||||
return new Vector3f(Float.parseFloat(split[0]),
|
||||
Float.parseFloat(split[1]),
|
||||
Float.parseFloat(split[2]));
|
||||
case Vector4:
|
||||
if (split.length != 4){
|
||||
if (split.length != 4) {
|
||||
throw new IOException("Vector4 value parameter must have 4 entries: " + value);
|
||||
}
|
||||
return new ColorRGBA(Float.parseFloat(split[0]),
|
||||
@ -206,30 +207,30 @@ public class J3MLoader implements AssetLoader {
|
||||
Float.parseFloat(split[2]),
|
||||
Float.parseFloat(split[3]));
|
||||
case Int:
|
||||
if (split.length != 1){
|
||||
if (split.length != 1) {
|
||||
throw new IOException("Int value parameter must have 1 entry: " + value);
|
||||
}
|
||||
return Integer.parseInt(split[0]);
|
||||
case Boolean:
|
||||
if (split.length != 1){
|
||||
if (split.length != 1) {
|
||||
throw new IOException("Boolean value parameter must have 1 entry: " + value);
|
||||
}
|
||||
return Boolean.parseBoolean(split[0]);
|
||||
default:
|
||||
throw new UnsupportedOperationException("Unknown type: "+type);
|
||||
throw new UnsupportedOperationException("Unknown type: " + type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// <TYPE> <NAME> [ "(" <FFBINDING> ")" ] [ ":" <DEFAULTVAL> ] [-LINEAR]
|
||||
private void readParam(String statement) throws IOException{
|
||||
private void readParam(String statement) throws IOException {
|
||||
String name;
|
||||
String defaultVal = null;
|
||||
ColorSpace colorSpace = null;
|
||||
|
||||
String[] split = statement.split("-");
|
||||
if(split.length>1){
|
||||
if(split[1].equalsIgnoreCase("LINEAR")){
|
||||
if (split.length > 1) {
|
||||
if (split[1].equalsIgnoreCase("LINEAR")) {
|
||||
colorSpace = ColorSpace.Linear;
|
||||
}
|
||||
statement = split[0].trim();
|
||||
@ -238,10 +239,10 @@ public class J3MLoader implements AssetLoader {
|
||||
split = statement.split(":");
|
||||
|
||||
// Parse default val
|
||||
if (split.length == 1){
|
||||
if (split.length == 1) {
|
||||
// Doesn't contain default value
|
||||
}else{
|
||||
if (split.length != 2){
|
||||
} else {
|
||||
if (split.length != 2) {
|
||||
throw new IOException("Parameter statement syntax incorrect");
|
||||
}
|
||||
statement = split[0].trim();
|
||||
@ -250,137 +251,137 @@ public class J3MLoader implements AssetLoader {
|
||||
|
||||
// Parse ffbinding
|
||||
int startParen = statement.indexOf("(");
|
||||
if (startParen != -1){
|
||||
if (startParen != -1) {
|
||||
// get content inside parentheses
|
||||
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
|
||||
statement = statement.substring(0, startParen);
|
||||
}
|
||||
|
||||
// Parse type + name
|
||||
split = statement.split(whitespacePattern);
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("Parameter statement syntax incorrect");
|
||||
}
|
||||
|
||||
VarType type;
|
||||
if (split[0].equals("Color")){
|
||||
if (split[0].equals("Color")) {
|
||||
type = VarType.Vector4;
|
||||
}else{
|
||||
} else {
|
||||
type = VarType.valueOf(split[0]);
|
||||
}
|
||||
|
||||
name = split[1];
|
||||
|
||||
Object defaultValObj = null;
|
||||
if (defaultVal != null){
|
||||
if (defaultVal != null) {
|
||||
defaultValObj = readValue(type, defaultVal);
|
||||
}
|
||||
if(type.isTextureType()){
|
||||
if (type.isTextureType()) {
|
||||
materialDef.addMaterialParamTexture(type, name, colorSpace);
|
||||
}else{
|
||||
} else {
|
||||
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
|
||||
String[] split = statement.split(":", 2);
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("Value parameter statement syntax incorrect");
|
||||
}
|
||||
String name = split[0].trim();
|
||||
|
||||
// parse value
|
||||
MatParam p = material.getMaterialDef().getMaterialParam(name);
|
||||
if (p == null){
|
||||
throw new IOException("The material parameter: "+name+" is undefined.");
|
||||
if (p == null) {
|
||||
throw new IOException("The material parameter: " + name + " is undefined.");
|
||||
}
|
||||
|
||||
Object valueObj = readValue(p.getVarType(), split[1]);
|
||||
if (p.getVarType().isTextureType()){
|
||||
if (p.getVarType().isTextureType()) {
|
||||
material.setTextureParam(name, p.getVarType(), (Texture) valueObj);
|
||||
}else{
|
||||
} else {
|
||||
material.setParam(name, p.getVarType(), valueObj);
|
||||
}
|
||||
}
|
||||
|
||||
private void readMaterialParams(List<Statement> paramsList) throws IOException{
|
||||
for (Statement statement : paramsList){
|
||||
private void readMaterialParams(List<Statement> paramsList) throws IOException {
|
||||
for (Statement statement : paramsList) {
|
||||
readParam(statement.getLine());
|
||||
}
|
||||
}
|
||||
|
||||
private void readExtendingMaterialParams(List<Statement> paramsList) throws IOException{
|
||||
for (Statement statement : paramsList){
|
||||
private void readExtendingMaterialParams(List<Statement> paramsList) throws IOException {
|
||||
for (Statement statement : paramsList) {
|
||||
readValueParam(statement.getLine());
|
||||
}
|
||||
}
|
||||
|
||||
private void readWorldParams(List<Statement> worldParams) throws IOException{
|
||||
for (Statement statement : worldParams){
|
||||
private void readWorldParams(List<Statement> worldParams) throws IOException {
|
||||
for (Statement statement : worldParams) {
|
||||
technique.addWorldParam(statement.getLine());
|
||||
}
|
||||
}
|
||||
|
||||
private boolean parseBoolean(String word){
|
||||
private boolean parseBoolean(String word) {
|
||||
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);
|
||||
if (split[0].equals("Wireframe")){
|
||||
if (split[0].equals("Wireframe")) {
|
||||
renderState.setWireframe(parseBoolean(split[1]));
|
||||
}else if (split[0].equals("FaceCull")){
|
||||
} else if (split[0].equals("FaceCull")) {
|
||||
renderState.setFaceCullMode(FaceCullMode.valueOf(split[1]));
|
||||
}else if (split[0].equals("DepthWrite")){
|
||||
} else if (split[0].equals("DepthWrite")) {
|
||||
renderState.setDepthWrite(parseBoolean(split[1]));
|
||||
}else if (split[0].equals("DepthTest")){
|
||||
} else if (split[0].equals("DepthTest")) {
|
||||
renderState.setDepthTest(parseBoolean(split[1]));
|
||||
}else if (split[0].equals("Blend")){
|
||||
} else if (split[0].equals("Blend")) {
|
||||
renderState.setBlendMode(BlendMode.valueOf(split[1]));
|
||||
}else if (split[0].equals("AlphaTestFalloff")){
|
||||
} else if (split[0].equals("AlphaTestFalloff")) {
|
||||
renderState.setAlphaTest(true);
|
||||
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 units = Float.parseFloat(split[2]);
|
||||
renderState.setPolyOffset(factor, units);
|
||||
}else if (split[0].equals("ColorWrite")){
|
||||
} else if (split[0].equals("ColorWrite")) {
|
||||
renderState.setColorWrite(parseBoolean(split[1]));
|
||||
}else if (split[0].equals("PointSprite")){
|
||||
} else if (split[0].equals("PointSprite")) {
|
||||
renderState.setPointSprite(parseBoolean(split[1]));
|
||||
}else if (split[0].equals("DepthFunc")){
|
||||
} else if (split[0].equals("DepthFunc")) {
|
||||
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]));
|
||||
} else {
|
||||
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();
|
||||
for (Statement statement : renderStates){
|
||||
for (Statement statement : renderStates) {
|
||||
readRenderStateStatement(statement);
|
||||
}
|
||||
renderState = null;
|
||||
}
|
||||
|
||||
private void readRenderState(List<Statement> renderStates) throws IOException{
|
||||
private void readRenderState(List<Statement> renderStates) throws IOException {
|
||||
renderState = new RenderState();
|
||||
for (Statement statement : renderStates){
|
||||
for (Statement statement : renderStates) {
|
||||
readRenderStateStatement(statement);
|
||||
}
|
||||
technique.setRenderState(renderState);
|
||||
renderState = null;
|
||||
}
|
||||
|
||||
private void readForcedRenderState(List<Statement> renderStates) throws IOException{
|
||||
private void readForcedRenderState(List<Statement> renderStates) throws IOException {
|
||||
renderState = new RenderState();
|
||||
for (Statement statement : renderStates){
|
||||
for (Statement statement : renderStates) {
|
||||
readRenderStateStatement(statement);
|
||||
}
|
||||
technique.setForcedRenderState(renderState);
|
||||
@ -388,41 +389,44 @@ public class J3MLoader implements AssetLoader {
|
||||
}
|
||||
|
||||
// <DEFINENAME> [ ":" <PARAMNAME> ]
|
||||
private void readDefine(String statement) throws IOException{
|
||||
private void readDefine(String statement) throws IOException {
|
||||
String[] split = statement.split(":");
|
||||
if (split.length == 1){
|
||||
if (split.length == 1) {
|
||||
// add preset define
|
||||
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());
|
||||
}else{
|
||||
} else {
|
||||
throw new IOException("Define syntax incorrect");
|
||||
}
|
||||
}
|
||||
|
||||
private void readDefines(List<Statement> defineList) throws IOException{
|
||||
for (Statement statement : defineList){
|
||||
private void readDefines(List<Statement> defineList) throws IOException {
|
||||
for (Statement statement : defineList) {
|
||||
readDefine(statement.getLine());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void readTechniqueStatement(Statement statement) throws IOException{
|
||||
private void readTechniqueStatement(Statement statement) throws IOException {
|
||||
String[] split = statement.getLine().split("[ \\{]");
|
||||
if (split[0].equals("VertexShader") ||
|
||||
split[0].equals("FragmentShader")){
|
||||
split[0].equals("FragmentShader") ||
|
||||
split[0].equals("GeometryShader") ||
|
||||
split[0].equals("TesselationControlShader") ||
|
||||
split[0].equals("TesselationEvaluationShader")) {
|
||||
readShaderStatement(statement.getLine());
|
||||
}else if (split[0].equals("LightMode")){
|
||||
} else if (split[0].equals("LightMode")) {
|
||||
readLightMode(statement.getLine());
|
||||
}else if (split[0].equals("ShadowMode")){
|
||||
} else if (split[0].equals("ShadowMode")) {
|
||||
readShadowMode(statement.getLine());
|
||||
}else if (split[0].equals("WorldParameters")){
|
||||
} else if (split[0].equals("WorldParameters")) {
|
||||
readWorldParams(statement.getContents());
|
||||
}else if (split[0].equals("RenderState")){
|
||||
} else if (split[0].equals("RenderState")) {
|
||||
readRenderState(statement.getContents());
|
||||
}else if (split[0].equals("ForcedRenderState")){
|
||||
} else if (split[0].equals("ForcedRenderState")) {
|
||||
readForcedRenderState(statement.getContents());
|
||||
}else if (split[0].equals("Defines")){
|
||||
} else if (split[0].equals("Defines")) {
|
||||
readDefines(statement.getContents());
|
||||
} else if (split[0].equals("ShaderNodesDefinitions")) {
|
||||
initNodesLoader();
|
||||
@ -444,15 +448,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);
|
||||
if (split.length != 2){
|
||||
if (split.length != 2) {
|
||||
throw new IOException("Transparent statement syntax incorrect");
|
||||
}
|
||||
material.setTransparent(parseBoolean(split[1]));
|
||||
}
|
||||
|
||||
private void readTechnique(Statement techStat) throws IOException{
|
||||
private void readTechnique(Statement techStat) throws IOException {
|
||||
isUseNodes = false;
|
||||
String[] split = techStat.getLine().split(whitespacePattern);
|
||||
if (split.length == 1) {
|
||||
@ -464,18 +468,18 @@ public class J3MLoader implements AssetLoader {
|
||||
throw new IOException("Technique statement syntax incorrect");
|
||||
}
|
||||
|
||||
for (Statement statement : techStat.getContents()){
|
||||
for (Statement statement : techStat.getContents()) {
|
||||
readTechniqueStatement(statement);
|
||||
}
|
||||
|
||||
if(isUseNodes){
|
||||
if (isUseNodes) {
|
||||
nodesLoaderDelegate.computeConditions();
|
||||
//used for caching later, the shader here is not a file.
|
||||
technique.setShaderFile(technique.hashCode() + "", technique.hashCode() + "", "GLSL100", "GLSL100");
|
||||
}
|
||||
|
||||
if(shaderName.containsKey(Shader.ShaderType.Vertex) && shaderName.containsKey(Shader.ShaderType.Fragment)){
|
||||
technique.setShaderFile(shaderName,shaderLanguage);
|
||||
if (shaderName.containsKey(Shader.ShaderType.Vertex) && shaderName.containsKey(Shader.ShaderType.Fragment)) {
|
||||
technique.setShaderFile(shaderName, shaderLanguage);
|
||||
}
|
||||
|
||||
materialDef.addTechniqueDef(technique);
|
||||
@ -484,40 +488,40 @@ public class J3MLoader implements AssetLoader {
|
||||
shaderName.clear();
|
||||
}
|
||||
|
||||
private void loadFromRoot(List<Statement> roots) throws IOException{
|
||||
if (roots.size() == 2){
|
||||
private void loadFromRoot(List<Statement> roots) throws IOException {
|
||||
if (roots.size() == 2) {
|
||||
Statement exception = roots.get(0);
|
||||
String line = exception.getLine();
|
||||
if (line.startsWith("Exception")){
|
||||
if (line.startsWith("Exception")) {
|
||||
throw new AssetLoadException(line.substring("Exception ".length()));
|
||||
}else{
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
|
||||
boolean extending = false;
|
||||
Statement materialStat = roots.get(0);
|
||||
String materialName = materialStat.getLine();
|
||||
if (materialName.startsWith("MaterialDef")){
|
||||
if (materialName.startsWith("MaterialDef")) {
|
||||
materialName = materialName.substring("MaterialDef ".length()).trim();
|
||||
extending = false;
|
||||
}else if (materialName.startsWith("Material")){
|
||||
} else if (materialName.startsWith("Material")) {
|
||||
materialName = materialName.substring("Material ".length()).trim();
|
||||
extending = true;
|
||||
}else{
|
||||
} else {
|
||||
throw new IOException("Specified file is not a Material file");
|
||||
}
|
||||
|
||||
String[] split = materialName.split(":", 2);
|
||||
|
||||
if (materialName.equals("")){
|
||||
if (materialName.equals("")) {
|
||||
throw new MatParseException("Material name cannot be empty", materialStat);
|
||||
}
|
||||
|
||||
if (split.length == 2){
|
||||
if (!extending){
|
||||
if (split.length == 2) {
|
||||
if (!extending) {
|
||||
throw new MatParseException("Must use 'Material' when extending.", materialStat);
|
||||
}
|
||||
|
||||
@ -531,35 +535,35 @@ public class J3MLoader implements AssetLoader {
|
||||
material = new Material(def);
|
||||
material.setKey(key);
|
||||
// material.setAssetName(fileName);
|
||||
}else if (split.length == 1){
|
||||
if (extending){
|
||||
} else if (split.length == 1) {
|
||||
if (extending) {
|
||||
throw new MatParseException("Expected ':', got '{'", materialStat);
|
||||
}
|
||||
materialDef = new MaterialDef(assetManager, materialName);
|
||||
// NOTE: pass file name for defs so they can be loaded later
|
||||
materialDef.setAssetName(key.getName());
|
||||
}else{
|
||||
} else {
|
||||
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("[ \\{]");
|
||||
String statType = split[0];
|
||||
if (extending){
|
||||
if (statType.equals("MaterialParameters")){
|
||||
if (extending) {
|
||||
if (statType.equals("MaterialParameters")) {
|
||||
readExtendingMaterialParams(statement.getContents());
|
||||
}else if (statType.equals("AdditionalRenderState")){
|
||||
} else if (statType.equals("AdditionalRenderState")) {
|
||||
readAdditionalRenderState(statement.getContents());
|
||||
}else if (statType.equals("Transparent")){
|
||||
} else if (statType.equals("Transparent")) {
|
||||
readTransparentStatement(statement.getLine());
|
||||
}
|
||||
}else{
|
||||
if (statType.equals("Technique")){
|
||||
} else {
|
||||
if (statType.equals("Technique")) {
|
||||
readTechnique(statement);
|
||||
}else if (statType.equals("MaterialParameters")){
|
||||
} else if (statType.equals("MaterialParameters")) {
|
||||
readMaterialParams(statement.getContents());
|
||||
}else{
|
||||
throw new MatParseException("Expected material statement, got '"+statType+"'", statement);
|
||||
} else {
|
||||
throw new MatParseException("Expected material statement, got '" + statType + "'", statement);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -573,18 +577,18 @@ public class J3MLoader implements AssetLoader {
|
||||
key = info.getKey();
|
||||
loadFromRoot(BlockLanguageParser.parse(in));
|
||||
} finally {
|
||||
if (in != null){
|
||||
if (in != null) {
|
||||
in.close();
|
||||
}
|
||||
}
|
||||
|
||||
if (material != null){
|
||||
if (!(info.getKey() instanceof MaterialKey)){
|
||||
if (material != null) {
|
||||
if (!(info.getKey() instanceof MaterialKey)) {
|
||||
throw new IOException("Material instances must be loaded via MaterialKey");
|
||||
}
|
||||
// material implementation
|
||||
return material;
|
||||
}else{
|
||||
} else {
|
||||
// material definition
|
||||
return materialDef;
|
||||
}
|
||||
@ -601,9 +605,9 @@ public class J3MLoader implements AssetLoader {
|
||||
if (!isUseNodes) {
|
||||
isUseNodes = shaderName.get(Shader.ShaderType.Vertex) == null && shaderName.get(Shader.ShaderType.Fragment) == null;
|
||||
if (isUseNodes) {
|
||||
if(nodesLoaderDelegate == null){
|
||||
if (nodesLoaderDelegate == null) {
|
||||
nodesLoaderDelegate = new ShaderNodeLoaderDelegate();
|
||||
}else{
|
||||
} else {
|
||||
nodesLoaderDelegate.clear();
|
||||
}
|
||||
nodesLoaderDelegate.setTechniqueDef(technique);
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
void main(){
|
||||
gl_FragColor=vec4(1.0,0.0,1.0,0.5);
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
layout (points) in;
|
||||
layout (line_strip) out;
|
||||
layout (max_vertices = 11) out;
|
||||
|
||||
uniform mat4 g_WorldViewProjectionMatrix;
|
||||
const float PI = 3.1415926;
|
||||
void main(){
|
||||
for (int i = 0; i <= 10; i++) {
|
||||
|
||||
float ang = PI * 2.0 / 10.0 * i;
|
||||
vec4 offset = vec4(cos(ang) * 5, -sin(ang) * 5, 0.0, 0.0);
|
||||
gl_Position = g_WorldViewProjectionMatrix*vec4(gl_in[0].gl_Position.xyz + offset.xyz,1.0);
|
||||
|
||||
EmitVertex();
|
||||
}
|
||||
|
||||
EndPrimitive();
|
||||
}
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
Material Pong Rock : Materials/Geom/SimpleGeom.j3md {
|
||||
MaterialParameters {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
MaterialDef SimpleGeom {
|
||||
|
||||
MaterialParameters {
|
||||
|
||||
}
|
||||
|
||||
Technique {
|
||||
VertexShader GLSL330: Materials/Geom/SimpleGeom.vert
|
||||
GeometryShader GLSL330: Materials/Geom/SimpleGeom.geom
|
||||
FragmentShader GLSL330: Materials/Geom/SimpleGeom.frag
|
||||
|
||||
WorldParameters {
|
||||
WorldViewProjectionMatrix
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
attribute vec3 inPosition;
|
||||
|
||||
void main(){
|
||||
gl_Position=vec4(inPosition,1);
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user