Added a method to create a shader state using Files and preprocessor
definitions. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@159 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -21,8 +21,15 @@
|
|||||||
|
|
||||||
package com.threerings.jme.util;
|
package com.threerings.jme.util;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileReader;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import com.jme.math.Vector3f;
|
import com.jme.math.Vector3f;
|
||||||
import com.jme.scene.Controller;
|
import com.jme.scene.Controller;
|
||||||
|
import com.jme.scene.state.GLSLShaderObjectsState;
|
||||||
|
import com.jme.system.DisplaySystem;
|
||||||
|
|
||||||
import com.samskivert.util.StringUtil;
|
import com.samskivert.util.StringUtil;
|
||||||
|
|
||||||
@@ -41,13 +48,13 @@ public class JmeUtil
|
|||||||
{
|
{
|
||||||
/** The index of the current frame. */
|
/** The index of the current frame. */
|
||||||
public int idx;
|
public int idx;
|
||||||
|
|
||||||
/** The current direction of animation. */
|
/** The current direction of animation. */
|
||||||
public int dir = +1;
|
public int dir = +1;
|
||||||
|
|
||||||
/** The fractional progress towards the next frame. */
|
/** The fractional progress towards the next frame. */
|
||||||
public float accum;
|
public float accum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resets the state back to the beginning.
|
* Resets the state back to the beginning.
|
||||||
*/
|
*/
|
||||||
@@ -55,7 +62,7 @@ public class JmeUtil
|
|||||||
{
|
{
|
||||||
set(0, +1, 0f);
|
set(0, +1, 0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the entire frame state.
|
* Sets the entire frame state.
|
||||||
*/
|
*/
|
||||||
@@ -65,7 +72,7 @@ public class JmeUtil
|
|||||||
this.dir = dir;
|
this.dir = dir;
|
||||||
this.accum = accum;
|
this.accum = accum;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the frame state after some amount of time has elapsed.
|
* Updates the frame state after some amount of time has elapsed.
|
||||||
*/
|
*/
|
||||||
@@ -76,7 +83,7 @@ public class JmeUtil
|
|||||||
advance(frameCount, repeatType);
|
advance(frameCount, repeatType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advances the position by one frame.
|
* Advances the position by one frame.
|
||||||
*/
|
*/
|
||||||
@@ -98,7 +105,7 @@ public class JmeUtil
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to parse a string containing an axis: either "x", "y", or "z", or three
|
* Attempts to parse a string containing an axis: either "x", "y", or "z", or three
|
||||||
* comma-delimited values representing an axis vector. The value returned may be one of
|
* comma-delimited values representing an axis vector. The value returned may be one of
|
||||||
@@ -120,7 +127,7 @@ public class JmeUtil
|
|||||||
return vector;
|
return vector;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to parse a string containing three comma-delimited values and return a
|
* Attempts to parse a string containing three comma-delimited values and return a
|
||||||
* {@link Vector3f}.
|
* {@link Vector3f}.
|
||||||
@@ -137,7 +144,7 @@ public class JmeUtil
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to parse a string describing one of the repeat types defined in {@link Controller}:
|
* Attempts to parse a string describing one of the repeat types defined in {@link Controller}:
|
||||||
* "clamp", "cycle", or "wrap". Will return the specified default if the type is
|
* "clamp", "cycle", or "wrap". Will return the specified default if the type is
|
||||||
@@ -156,4 +163,44 @@ public class JmeUtil
|
|||||||
}
|
}
|
||||||
return defaultType;
|
return defaultType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads the specified shaders (prepending the supplied preprocessor definitions)
|
||||||
|
* and returns a GLSL shader state. One of the supplied files may be <code>null</code>
|
||||||
|
* in order to use the fixed-function pipeline for that part.
|
||||||
|
*
|
||||||
|
* @param defs a number of preprocessor definitions to be #defined in both shaders
|
||||||
|
* (e.g., "ENABLE_FOG", "NUM_LIGHTS 2").
|
||||||
|
*/
|
||||||
|
public static GLSLShaderObjectsState loadShaders (File vert, File frag, String... defs)
|
||||||
|
{
|
||||||
|
GLSLShaderObjectsState sstate =
|
||||||
|
DisplaySystem.getDisplaySystem().getRenderer().createGLSLShaderObjectsState();
|
||||||
|
sstate.load(
|
||||||
|
(vert == null) ? null : readSource(vert, defs),
|
||||||
|
(frag == null) ? null : readSource(frag, defs));
|
||||||
|
return sstate;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads an entire source file as a string, prepending the supplied preprocessor definitions.
|
||||||
|
*/
|
||||||
|
protected static String readSource (File file, String[] defs)
|
||||||
|
{
|
||||||
|
StringBuffer buf = new StringBuffer();
|
||||||
|
String ln = System.getProperty("line.separator");
|
||||||
|
for (String def : defs) {
|
||||||
|
buf.append("#define ").append(def).append(ln);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
BufferedReader reader = new BufferedReader(new FileReader(file));
|
||||||
|
String line;
|
||||||
|
while ((line = reader.readLine()) != null) {
|
||||||
|
buf.append(line).append(ln);
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return buf.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user