summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes/com')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java14
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java48
2 files changed, 46 insertions, 16 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
index e485e5452..2da2dcbfc 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/ImageSequence.java
@@ -153,17 +153,21 @@ public class ImageSequence implements TextureSequence {
private String textureLookupFunctionName = "myTexture2D";
@Override
- public String getTextureLookupFunctionName(final String desiredFuncName) throws IllegalStateException {
+ public String setTextureLookupFunctionName(final String texLookupFuncName) throws IllegalStateException {
if(useBuildInTexLookup) {
- return "texture2D";
- }
- if(null != desiredFuncName && desiredFuncName.length()>0) {
- textureLookupFunctionName = desiredFuncName;
+ textureLookupFunctionName = "texture2D";
+ } else if(null != texLookupFuncName && texLookupFuncName.length()>0) {
+ textureLookupFunctionName = texLookupFuncName;
}
return textureLookupFunctionName;
}
@Override
+ public String getTextureLookupFunctionName() throws IllegalStateException {
+ return textureLookupFunctionName;
+ }
+
+ @Override
public String getTextureLookupFragmentShaderImpl() throws IllegalStateException {
if(useBuildInTexLookup) {
return "";
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java
index 7147fd61b..2b91f3b1f 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java
@@ -226,15 +226,28 @@ public interface TextureSequence {
public String getTextureSampler2DType() throws IllegalStateException ;
/**
- * @param desiredFuncName desired lookup function name. If <code>null</code> or ignored by the implementation,
- * a build-in name is returned.
- * @return the final lookup function name
+ * Set the desired shader code's texture lookup function name.
*
- * @see {@link #getTextureLookupFragmentShaderImpl()}
+ * @param texLookupFuncName desired lookup function name. If <code>null</code> or ignored by the implementation,
+ * a build-in name is returned.
+ * @return the chosen lookup function name
*
* @throws IllegalStateException if instance is not initialized
+ * @see #getTextureLookupFunctionName()
+ * @see #getTextureFragmentShaderHashCode()
+ * @see #getTextureLookupFragmentShaderImpl()
*/
- public String getTextureLookupFunctionName(String desiredFuncName) throws IllegalStateException ;
+ public String setTextureLookupFunctionName(String texLookupFuncName) throws IllegalStateException ;
+
+ /**
+ * Returns the chosen lookup function name, which can be set via {@link #setTextureLookupFunctionName(String)}.
+ *
+ * @throws IllegalStateException if instance is not initialized
+ * @see #setTextureLookupFunctionName(String)
+ * @see #getTextureFragmentShaderHashCode()
+ * @see #getTextureLookupFragmentShaderImpl()
+ */
+ public String getTextureLookupFunctionName() throws IllegalStateException ;
/**
* Returns the complete texture2D lookup function code of type
@@ -245,36 +258,49 @@ public interface TextureSequence {
* }
* </pre>
* <p>
- * <i>funcName</i> can be negotiated and queried via {@link #getTextureLookupFunctionName(String)}.
+ * <i>funcName</i> is set via {@link #setTextureLookupFunctionName(String)}
+ * and queried via {@link #getTextureLookupFunctionName()}.
+ * </p>
+ * <p>
+ * User shall call {@link #setTextureLookupFunctionName(String)} first if intended.
* </p>
+ * <p>
* Note: This function may return an empty string in case a build-in lookup
* function is being chosen. If the implementation desires so,
- * {@link #getTextureLookupFunctionName(String)} will ignore the desired function name
+ * {@link #getTextureLookupFunctionName()} will ignore the desired function name
* and returns the build-in lookup function name.
* </p>
- * @see #getTextureLookupFunctionName(String)
- * @see #getTextureSampler2DType()
- *
* @throws IllegalStateException if instance is not initialized
+ * @see #getTextureLookupFunctionName()
+ * @see #setTextureLookupFunctionName(String)
+ * @see #getTextureFragmentShaderHashCode()
+ * @see #getTextureSampler2DType()
*/
public String getTextureLookupFragmentShaderImpl() throws IllegalStateException;
/**
* Returns the hash code of the strings:
* <ul>
+ * <li>{@link #getTextureLookupFunctionName()}</li>
* <li>{@link #getTextureLookupFragmentShaderImpl()}</li>
* <li>{@link #getTextureSampler2DType()}</li>
* </ul>
* <p>
+ * User shall call {@link #setTextureLookupFunctionName(String)} first if intended.
+ * </p>
+ * <p>
* Returns zero if {@link #isTextureAvailable() texture is not available}.
* </p>
* The returned hash code allows selection of a matching shader program for this {@link TextureSequence} instance.
* <p>
* </p>
* <p>
- * Implementation shall cache the resulting hash code,
+ * Implementation caches the resulting hash code,
* which must be reset to zero if {@link #isTextureAvailable() texture is not available}.
* </p>
+ * @see #setTextureLookupFunctionName(String)
+ * @see #getTextureLookupFunctionName()
+ * @see #getTextureLookupFragmentShaderImpl()
*/
public int getTextureFragmentShaderHashCode();
}