raytracing works, cleanup needed

Author: diroru

data/cubeMapQuadFrag.glsl

@@ -1,8 +1,36 @@
+#define PI 3.1415926535897932384626433832795
+
+precision highp float;
+precision highp int;
+
 uniform samplerCube cubemap;
-varying vec2 vertTexCoord;
-void main() {
-  //vec3 color = vec3(textureCube(cubemap, vec3(vertTexCoord,1.0)));
-  //gl_FragColor = vec4(vertTexCoord, 0.0, 1.0);
-  gl_FragColor = vec4(1.0, 0.0, 1.0, 1.0);
-  //gl_FragColor = vec4(color, 1.0);
-}
+
+varying vec2 vertTexCoord;
+
+vec2 domeXYToLatLon(vec2 xy, float aperture) {
+  float x = xy.x - 0.5;
+  float y = xy.y - 0.5;
+  float lat = sqrt(x*x + y*y) * aperture;
+  float lon = atan(y,x);
+  return vec2(lat, lon);
+}
+
+vec3 latLonToXYZ(vec2 latLon) {
+  float lat = latLon.x;
+  float lon = latLon.y;
+  float x = cos(lon) * sin(lat);
+  float y = sin(lon) * sin(lat);
+  float z = cos(lat);
+  return vec3(x,y,z);
+}
+
+vec3 domeXYToXYZ(vec2 xy, float aperture) {
+  return latLonToXYZ(domeXYToLatLon(xy, aperture));
+}
+
+void main() {
+  vec3 ray = domeXYToXYZ(vertTexCoord, 1.0*PI);
+  //vec3 rgb = ray * 0.5 + vec3(0.5); //DEBUG
+  vec3 color = vec3(textureCube(cubemap, ray));
+  gl_FragColor = vec4(color, 1.0);
+}

data/cubeMapQuadVert.glsl

@@ -1,3 +1,6 @@
+precision highp float;
+precision highp int;
+
 uniform mat4 transform;
 uniform mat4 modelview;
 uniform mat3 normalMatrix;

src/codeanticode/planetarium/Dome.java

@@ -47,10 +47,7 @@ public class Dome extends PGraphics3D {
   public final static int NORMAL   = 0;
   public final static int GRID     = 1;	
 
-  protected PShader cubeMapShader;
   protected PShader cubeMapQuadShader;
-  protected PShape domeSphere;
-  protected PShape gridSphere;
   protected PShape domeQuad;
 
   protected int resolution;
@@ -64,8 +61,6 @@ public class Dome extends PGraphics3D {
   protected int cubeMapSize = 1024;
 
   protected boolean renderDomeQuad = true;
-  //protected boolean renderDome = true;
-  //protected boolean renderGrid = false;
   protected int currentFace;
 
   protected boolean requestedRenderDomeChange = false;
@@ -306,86 +301,18 @@ protected int getCurrentFace() {
     return currentFace;
   }
 
-  
-  private void initDome() {
-    if (domeSphere == null) {
-      domeSphere = createShape(SPHERE, resolution * 0.5f);
-      domeSphere.rotateX(HALF_PI);
-      domeSphere.setStroke(false);
-    }
-    
-    if (gridSphere == null) {
-      gridSphere = createShape(SPHERE, resolution * 0.5f);
-      gridSphere.rotateX(HALF_PI);
-      gridSphere.setFill(0xFF000000);
-      gridSphere.setStroke(0xFFFFFFFF);      
-    }
-    
-    if (cubeMapShader == null) {    
-      cubeMapShader = parent.loadShader("cubeMapFrag.glsl", 
-                                        "cubeMapVert.glsl"); 
-      cubeMapShader.set("cubemap", 1);
-    }
-    
-    
-    if (!cubeMapInit) {
-      PGL pgl = beginPGL();
-      
-      cubeMapSize = PApplet.min(nextPowerOfTwo(resolution), maxTextureSize);
-      
-      cubeMapTex = IntBuffer.allocate(1);
-      pgl.genTextures(1, cubeMapTex);
-      pgl.bindTexture(PGL.TEXTURE_CUBE_MAP, cubeMapTex.get(0));
-      pgl.texParameteri(PGL.TEXTURE_CUBE_MAP, PGL.TEXTURE_WRAP_S, 
-                        PGL.CLAMP_TO_EDGE);
-      pgl.texParameteri(PGL.TEXTURE_CUBE_MAP, PGL.TEXTURE_WRAP_T, 
-                        PGL.CLAMP_TO_EDGE);
-      pgl.texParameteri(PGL.TEXTURE_CUBE_MAP, PGL.TEXTURE_WRAP_R, PGL.CLAMP_TO_EDGE);
-      pgl.texParameteri(PGL.TEXTURE_CUBE_MAP, PGL.TEXTURE_MIN_FILTER, 
-                        PGL.NEAREST);
-      pgl.texParameteri(PGL.TEXTURE_CUBE_MAP, PGL.TEXTURE_MAG_FILTER, 
-                        PGL.NEAREST);
-      for (int i = PGL.TEXTURE_CUBE_MAP_POSITIVE_X; i < 
-                   PGL.TEXTURE_CUBE_MAP_POSITIVE_X + 6; i++) {
-        pgl.texImage2D(i, 0, PGL.RGBA8, cubeMapSize, cubeMapSize, 0, 
-                       PGL.RGBA, PGL.UNSIGNED_BYTE, null);
-      }
-      
-      // Init fbo, rbo
-      cubeMapFbo = IntBuffer.allocate(1);
-      cubeMapRbo = IntBuffer.allocate(1);
-      pgl.genFramebuffers(1, cubeMapFbo);
-      pgl.bindFramebuffer(PGL.FRAMEBUFFER, cubeMapFbo.get(0));
-      pgl.framebufferTexture2D(PGL.FRAMEBUFFER, PGL.COLOR_ATTACHMENT0, 
-                               PGL.TEXTURE_CUBE_MAP_POSITIVE_X, 
-                               cubeMapTex.get(0), 0);
-
-      pgl.genRenderbuffers(1, cubeMapRbo);
-      pgl.bindRenderbuffer(PGL.RENDERBUFFER, cubeMapRbo.get(0));
-      pgl.renderbufferStorage(PGL.RENDERBUFFER, PGL.DEPTH_COMPONENT24, 
-                              cubeMapSize, cubeMapSize);
-      
-      // Attach depth buffer to FBO
-      pgl.framebufferRenderbuffer(PGL.FRAMEBUFFER, PGL.DEPTH_ATTACHMENT, 
-                                  PGL.RENDERBUFFER, cubeMapRbo.get(0));    
-      
-      endPGL();
-      
-      cubeMapInit = true;
-    }
-  }
-  
   private void initDomeQuad() {
 	    if (domeQuad == null) {
 	    		domeQuad = createShape();
 		    	domeQuad.beginShape();
 		    	domeQuad.fill(255,255,0);
 		    	domeQuad.textureMode(NORMAL);
 	    	    domeQuad.noStroke();
-	    	    domeQuad.vertex(0, 0, 0, 0, 0);
-	    	    domeQuad.vertex(300, 0, 0, 1, 0);
-	    	    domeQuad.vertex(300, 300, 0, 1, 1);
-	    	    domeQuad.vertex(0, 300, 0, 0, 1);
+	    	    //TODO
+	    	    domeQuad.vertex(-width*0.5f, -height*0.5f, 0, 0, 0);
+	    	    domeQuad.vertex(width*0.5f, -height*0.5f, 0, 1, 0);
+	    	    domeQuad.vertex(width*0.5f, height*0.5f, 0, 1, 1);
+	    	    domeQuad.vertex(-width*0.5f, height*0.5f, 0, 0, 1);
 	    	    domeQuad.endShape();
 	    }
 
@@ -479,44 +406,21 @@ private void endFaceDraw() {
                              currentFace, 0, 0);
   }
 
-/*  
-  private void renderDome() {
-    renderBorder();
-    
-    //This setting might be better for 2.1.2+:
-    //camera(0, 0, resolution * 0.5f, 0, 0, 0, 0, 1, 0);
-    //ortho(-width/2, width/2, -height/2, height/2);
-    
-    camera();
-    ortho(domeLeft, domeRight, domeBottom, domeTop);
-    resetMatrix();    
-    translate(domeDX, domeDY, domeDZ);
-    scale(domeScale);      
-    if (renderGrid) {   
-      shape(gridSphere);
-    } else {
-      shader(cubeMapShader);
-      shape(domeSphere);
-      resetShader();      
-    }
-    renderScreen();
-  }
-  */
   private void renderDomeQuad() {
 	    renderBorder();
 
 	    //This setting might be better for 2.1.2+:
-	    //camera(0, 0, resolution * 0.5f, 0, 0, 0, 0, 1, 0);
-	    //ortho(-width/2, width/2, -height/2, height/2);
+	    camera(0, 0, resolution * 0.5f, 0, 0, 0, 0, 1, 0);
+	    ortho(-width/2, width/2, -height/2, height/2);
+	    //ortho(-width, 0, -height, 0);
 	    /*
 	    camera();
 	    ortho(domeLeft, domeRight, domeBottom, domeTop);
+	    */
 	    resetMatrix();    
 	    translate(domeDX, domeDY, domeDZ);
 	    scale(domeScale);      
 	    shader(cubeMapQuadShader);
-	    */
-	    resetMatrix();    
 	    shape(domeQuad);
 	    resetShader();      
 	    renderScreen();