adds grid

Author: diroru

data/cubeMapQuadFrag.glsl

@@ -1,10 +1,10 @@
+//grid code originally appears: https://github.com/diroru/domemod
 #define PI 3.1415926535897932384626433832795
-
-precision highp float;
-precision highp int;
+#define AA 0.1
 
 uniform samplerCube cubemap;
 uniform float aperture;
+uniform float renderGrid;
 
 varying vec2 vertTexCoord;
 
@@ -29,9 +29,50 @@ vec3 domeXYToXYZ(vec2 xy, float aperture) {
   return latLonToXYZ(domeXYToLatLon(xy, aperture));
 }
 
+float rad2Deg(float r) {
+  return r * 180.0 / PI;
+}
+
+vec3 getLatitudeGrid(vec2 longLat, float gratOffset, float gratWidth, vec3 gratColour) {
+	float gr = mod(rad2Deg(longLat.y) + gratWidth * 0.5, gratOffset) - gratWidth * 0.5;
+	//return mix(gratColour, vec3(0.0), smoothstep(gratWidth*0.5 - AA, gratWidth*0.5 + AA, abs(gr)));
+	return mix(gratColour, vec3(0.0), step(gratWidth, abs(gr)));
+}
+
+vec3 getLongtitudeGrid(vec2 longLat, float gratOffset, float gratWidth, vec3 gratColour) {
+	float longDeg = rad2Deg(longLat.x);
+	float latDeg = rad2Deg(longLat.y);
+	float go = gratWidth / sin(longLat.y);
+	float gr = mod(longDeg + go , gratOffset) - go;
+	//return mix(gratColour, vec3(0.0), smoothstep(go*0.5 - AA, go*0.5 + AA, abs(gr)));
+	return mix(gratColour, vec3(0.0), step(go, abs(gr)));
+}
+
+vec3 getGrid(vec2 longLat, vec3 colour, float gratOffset0, float gratWidth0, float gratOffset1, float gratWidth1) {
+	vec3 longGrid_0 = getLongtitudeGrid(longLat, gratOffset0, gratWidth0, colour);
+  vec3 longGrid_1 = getLongtitudeGrid(longLat, gratOffset1, gratWidth1, colour);
+	vec3 latGrid_0 = getLatitudeGrid(longLat, gratOffset0, gratWidth0, colour);
+  vec3 latGrid_1 = getLatitudeGrid(longLat, gratOffset1, gratWidth1, colour);
+	vec3 grid_rgb = longGrid_0 + longGrid_1 + latGrid_0 + latGrid_1;
+	//grid_rgb = longGrid_0;
+	//TODO eg. vec3(0.0) as const
+	return clamp(grid_rgb, vec3(0.0), vec3(1.0));
+	//return grid_rgb;
+}
+
+
+
 void main() {
-  vec3 ray = domeXYToXYZ(vertTexCoord, aperture*PI);
-  //vec3 rgb = ray * 0.5 + vec3(0.5); //DEBUG
+  //vec3 color = vec3(textureCube(cubemap, vec3(vertTexCoord,1.0)));
+  vec2 latLon = domeXYToLatLon(vertTexCoord, aperture*PI);
+  vec3 ray = latLonToXYZ(latLon);
+  //vec3 color = ray * 0.5 + vec3(0.5);
   vec3 color = vec3(textureCube(cubemap, ray));
-  gl_FragColor = vec4(color, 1.0);
+
+  vec3 gridColor = getGrid(latLon.yx, vec3(1.0, 1.0, 0.0), 45.0, 0.6, 15.0, 0.2);
+//  float gridX = 1.0 - smoothstep(gridWeight*0.5-AA, gridWeight*0.5+AA, mod(latLon.x - gridWeight*0.5, gridSize.x));
+//  float gridY = 1.0 - smoothstep(gridWeight*0.5-AA, gridWeight*0.5+AA, mod(latLon.y - gridWeight*0.5, gridSize.y));
+
+  gl_FragColor = vec4(mix(color, gridColor, min(length(gridColor)*0.5, renderGrid)), 1.0);
+  //gl_FragColor = vec4(rgb + gridColor, 1.0);
 }

examples/Basic/Basic.pde

@@ -18,9 +18,14 @@ import codeanticode.planetarium.*;
 
 float cubeX, cubeY, cubeZ;
 
+DomeCamera dc;
+int gridMode = Dome.NORMAL;
+
 void setup() {
   // For the time being, only use square windows  
-  size(600, 600, Dome.RENDERER);
+  size(1024, 1024, Dome.RENDERER);
+  
+  dc = new DomeCamera(this);
 }
 
 // Called one time per frame.
@@ -36,7 +41,7 @@ void draw() {
   background(0);
 
   pushMatrix();  
-  translate(width/2, height/2, 300);
+  translate(width/2, height/2, -300);
 
   lights();
 
@@ -56,9 +61,18 @@ void draw() {
   popMatrix();
 }
 
+void mouseDragged() {
+  //exaggerating dome aperture. 1f <=> 180°
+  dc.setDomeAperture(map(mouseY,0,height,0.1f,4f));
+}
+
 void keyPressed() {
   if (key == CODED) {
     if (keyCode == UP) cubeZ -= 5;
     else if (keyCode == DOWN) cubeZ += 5;
-  }  
+  }
+  if (key == ' ') {
+    gridMode = gridMode == Dome.GRID ? Dome.NORMAL : Dome.GRID;
+    dc.setMode(gridMode);
+  }
 }

src/codeanticode/planetarium/Dome.java

@@ -70,6 +70,7 @@ public class Dome extends PGraphics3D {
   protected float domeDX, domeDY, domeDZ;
   protected float domeScale = 1;  
   protected float domeAperture = 1f;
+  protected float renderGrid = 0f;
 
   protected Method borderMethod;
   protected Method screenMethod; 
@@ -292,11 +293,16 @@ protected void domeRendering(boolean value) {
     }
   }
 
-  /*
   protected void renderGrid(boolean value) {
-    renderGrid = value;
+    renderGrid = value ? 1f : 0f;
+    if(cubeMapQuadShader != null) {
+	    	try {
+	    		cubeMapQuadShader.set("renderGrid", renderGrid);
+	    	} catch(Exception e) {
+	    		e.printStackTrace();
+	    	}
+    	}
   }  
-  */
 
   protected int getCurrentFace() {
     return currentFace;

src/codeanticode/planetarium/DomeCamera.java

@@ -43,13 +43,11 @@ public DomeCamera(PApplet parent) {
   }
 
   public void setMode(int mode) {
-	  /*
     if (mode == Dome.NORMAL) {
       renderer.renderGrid(false);
     } else if (mode == Dome.GRID) {
       renderer.renderGrid(true);
     }
-    */
   }
 
   public void setDomeAperture(float theAperture) {