Rename 2nd model texture from Index to Neighborhood (#773)

Author: jkbelcher

te-app/src/main/java/titanicsend/ndi/NDIOutShader.java

@@ -32,7 +32,7 @@ public class NDIOutShader extends GLShader implements GLShader.UniformSource {
   private String ndiStreamLabel = "TitanicsEnd";
 
   private int modelCoordsTextureHandle = UNINITIALIZED;
-  private int modelIndexTextureHandle = UNINITIALIZED;
+  private int modelNeighborhoodTextureHandle = UNINITIALIZED;
 
   // Variables that will be passed to uniforms
   // Incoming texture handle
@@ -199,7 +199,8 @@ public int getRenderTexture() {
    */
   public void setModelCoordinates(LXModel model) {
     this.modelCoordsTextureHandle = this.glEngine.textureCache.getModelCoordsTexture(model);
-    this.modelIndexTextureHandle = this.glEngine.textureCache.getModelIndexTexture(model);
+    this.modelNeighborhoodTextureHandle =
+        this.glEngine.textureCache.getModelNeighborhoodTexture(model);
   }
 
   @Override

te-app/src/main/java/titanicsend/pattern/glengine/GLShader.java

@@ -53,7 +53,7 @@ public abstract class GLShader {
   public static final int TEXTURE_UNIT_AUDIO = 0;
   public static final int TEXTURE_UNIT_MODEL_COORDS = 1;
   public static final int TEXTURE_UNIT_BACKBUFFER = 2;
-  public static final int TEXTURE_UNIT_MODEL_INDEX = 3;
+  public static final int TEXTURE_UNIT_MODEL_NEIGHBORHOOD = 3;
   public static final int FIRST_UNRESERVED_TEXTURE_UNIT = 4;
 
   /**
@@ -218,7 +218,8 @@ public GLShader(Config config) {
     // Reserved texture units
     this.uniformTextureUnits.put(UniformNames.BACK_BUFFER, TEXTURE_UNIT_BACKBUFFER);
     this.uniformTextureUnits.put(UniformNames.LX_MODEL_COORDS, TEXTURE_UNIT_MODEL_COORDS);
-    this.uniformTextureUnits.put(UniformNames.LX_MODEL_INDEX, TEXTURE_UNIT_MODEL_INDEX);
+    this.uniformTextureUnits.put(
+        UniformNames.LX_MODEL_NEIGHBORHOOD, TEXTURE_UNIT_MODEL_NEIGHBORHOOD);
   }
 
   // Buffers

te-app/src/main/java/titanicsend/pattern/glengine/TEShader.java

@@ -43,15 +43,15 @@ private class TextureInfo {
   // Render buffers: ping-pong FBOs and textures
   private PingPongFBO ppFBOs;
 
-  // Texture handle for the current view model coordinate texture
+  // Texture handles for the current view model textures
   private int modelCoordsTextureHandle = UNINITIALIZED;
-  private int modelIndexTextureHandle = UNINITIALIZED;
+  private int modelNeighborhoodTextureHandle = UNINITIALIZED;
 
   private static class TEShaderUniforms {
     private Uniform.Int1 audio;
     private Uniform.Int1 lxModelCoords;
     private Uniform.Int1 backBuffer;
-    private Uniform.Int1 lxModelIndex;
+    private Uniform.Int1 lxModelNeighborhood;
   }
 
   private final TEShaderUniforms uniforms = new TEShaderUniforms();
@@ -140,7 +140,7 @@ private void initializeUniforms() {
     this.uniforms.audio = getUniformInt1(UniformNames.AUDIO_CHANNEL);
     this.uniforms.lxModelCoords = getUniformInt1(UniformNames.LX_MODEL_COORDS);
     this.uniforms.backBuffer = getUniformInt1(UniformNames.BACK_BUFFER);
-    this.uniforms.lxModelIndex = getUniformInt1(UniformNames.LX_MODEL_INDEX);
+    this.uniforms.lxModelNeighborhood = getUniformInt1(UniformNames.LX_MODEL_NEIGHBORHOOD);
   }
 
   @Override
@@ -178,8 +178,8 @@ public void setUniforms(GLShader s) {
     bindTextureUnit(TEXTURE_UNIT_MODEL_COORDS, this.modelCoordsTextureHandle);
     this.uniforms.lxModelCoords.setValue(TEXTURE_UNIT_MODEL_COORDS);
 
-    bindTextureUnit(TEXTURE_UNIT_MODEL_INDEX, this.modelIndexTextureHandle);
-    this.uniforms.lxModelIndex.setValue(TEXTURE_UNIT_MODEL_INDEX);
+    bindTextureUnit(TEXTURE_UNIT_MODEL_NEIGHBORHOOD, this.modelNeighborhoodTextureHandle);
+    this.uniforms.lxModelNeighborhood.setValue(TEXTURE_UNIT_MODEL_NEIGHBORHOOD);
 
     // Clear backbuffer on first frame
     if (this.needsClearBackBuffer) {
@@ -272,7 +272,7 @@ protected void render() {
   public void unbindTextures() {
     // Unbind textures (except for audio, which stays bound for all patterns)
     unbindTextureUnit(TEXTURE_UNIT_MODEL_COORDS);
-    unbindTextureUnit(TEXTURE_UNIT_MODEL_INDEX);
+    unbindTextureUnit(TEXTURE_UNIT_MODEL_NEIGHBORHOOD);
     unbindTextureUnit(TEXTURE_UNIT_BACKBUFFER);
     for (TextureInfo ti : this.fileTextures) {
       unbindTextureUnit(ti.unit);
@@ -301,7 +301,8 @@ public void setCpuBuffer(int[] cpuBuffer) {
    */
   public void setModel(LXModel model) {
     this.modelCoordsTextureHandle = this.glEngine.textureCache.getModelCoordsTexture(model);
-    this.modelIndexTextureHandle = this.glEngine.textureCache.getModelIndexTexture(model);
+    this.modelNeighborhoodTextureHandle =
+        this.glEngine.textureCache.getModelNeighborhoodTexture(model);
   }
 
   // Releases native resources allocated by this shader.

te-app/src/main/java/titanicsend/pattern/glengine/TextureManager.java

@@ -10,7 +10,7 @@
 import static com.jogamp.opengl.GL.GL_TEXTURE_WRAP_S;
 import static com.jogamp.opengl.GL.GL_TEXTURE_WRAP_T;
 import static titanicsend.pattern.glengine.GLShader.TEXTURE_UNIT_MODEL_COORDS;
-import static titanicsend.pattern.glengine.GLShader.TEXTURE_UNIT_MODEL_INDEX;
+import static titanicsend.pattern.glengine.GLShader.TEXTURE_UNIT_MODEL_NEIGHBORHOOD;
 
 import com.jogamp.opengl.GL4;
 import com.jogamp.opengl.GLAutoDrawable;
@@ -125,8 +125,8 @@ public void createModelTextures(LXModel model) {
     ModelTexture[] slots = new ModelTexture[MODEL_TEXTURE_COUNT];
     ModelTexture normalizedXYZ = new ModelTexture();
     slots[0] = normalizedXYZ;
-    ModelTexture indexMap = new ModelTexture();
-    slots[1] = indexMap;
+    ModelTexture neighborhood = new ModelTexture();
+    slots[1] = neighborhood;
     this.modelTextures.put(model, slots);
 
     // Double check size of engine and model points
@@ -190,15 +190,15 @@ public void createModelTextures(LXModel model) {
     gl4.glBindTexture(GL_TEXTURE_2D, 0);
     gl4.glActiveTexture(GL_TEXTURE0);
 
-    // And create an OpenGL texture to hold the index data
-    this.glEngine.bindTextureUnit(TEXTURE_UNIT_MODEL_INDEX, indexMap.getHandle());
+    // And create an OpenGL texture to hold the neighborhood data
+    this.glEngine.bindTextureUnit(TEXTURE_UNIT_MODEL_NEIGHBORHOOD, neighborhood.getHandle());
 
     gl4.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     gl4.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     gl4.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     gl4.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-    // load the index data into the texture
+    // load the neighborhood data into the texture
     gl4.glTexImage2D(
         GL4.GL_TEXTURE_2D, 0, GL4.GL_RG32F, width, height, 0, GL4.GL_RG, GL4.GL_FLOAT, indices);
 
@@ -225,7 +225,7 @@ private int getModelTexture(LXModel model, int textureUnit) {
       case TEXTURE_UNIT_MODEL_COORDS: // normalized coordinates
         tex = slots[0];
         break;
-      case TEXTURE_UNIT_MODEL_INDEX: // textureUnit mapping
+      case TEXTURE_UNIT_MODEL_NEIGHBORHOOD: // textureUnit mapping
         tex = slots[1];
         break;
       default:
@@ -265,11 +265,11 @@ public int getModelCoordsTexture(LXModel model) {
    * @param model The model (view) to copy coordinates from
    * @return The texture handle of the view's indices texture
    */
-  public int getModelIndexTexture(LXModel model) {
+  public int getModelNeighborhoodTexture(LXModel model) {
     if (!hasModelTextures(model)) {
       createModelTextures(model);
     }
-    return getModelTexture(model, TEXTURE_UNIT_MODEL_INDEX);
+    return getModelTexture(model, TEXTURE_UNIT_MODEL_NEIGHBORHOOD);
   }
 
   /**

te-app/src/main/java/titanicsend/pattern/yoffa/shader_engine/UniformNames.java

@@ -9,6 +9,6 @@ public class UniformNames {
   public static final String AUDIO_CHANNEL = CHANNEL + "0";
   public static final String LX_PARAMETER_SUFFIX = "_parameter";
   public static final String LX_MODEL_COORDS = "lxModelCoords";
-  public static final String LX_MODEL_INDEX = "lxModelIndex";
+  public static final String LX_MODEL_NEIGHBORHOOD = "lxModelIndex";
   public static final String BACK_BUFFER = "iBackbuffer";
 }