From a434119e65146fe53d612c28e1ee7af532d1b70a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 28 Jul 2019 15:25:44 -0400
Subject: [PATCH] Skyboxes
---
CameraPane.java | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 40 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index fdb5f77..bd26db2 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -187,6 +187,18 @@
}
private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
+
+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
+ {
+ try
+ {
+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
+ } catch (IOException e)
+ {
+ System.out.println("NAME = " + name);
+ e.printStackTrace(); // throw new RuntimeException(e);
+ }
+ }
void SetAsGLRenderer(boolean b)
{
@@ -1485,6 +1497,8 @@
gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
}
+ float[] colorV = new float[4];
+
void SetColor(Object3D obj, Vertex p0)
{
CameraPane display = this;
@@ -1552,8 +1566,6 @@
{
return;
}
-
- float[] colorV = new float[3];
if (false) // marked)
{
@@ -8932,7 +8944,7 @@
if (cubemap == null)
{
- LoadEnvy(5);
+ //LoadEnvy(1);
}
//cubemap.enable();
@@ -9219,37 +9231,58 @@
cubemap = null;
return;
case 1:
- name = "cubemaps/box_";
- ext = "png";
+ name = "cubemaps/rgb/";
+ ext = "jpg";
reverseUP = false;
break;
case 2:
- name = "cubemaps/uffizi_";
- ext = "png";
- break; // reverseUP = true; break;
+ name = "cubemaps/uffizi/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
case 3:
- name = "cubemaps/CloudyHills_";
- ext = "tga";
+ name = "cubemaps/CloudyHills/";
+ ext = "jpg";
reverseUP = false;
break;
case 4:
- name = "cubemaps/cornell_";
+ name = "cubemaps/cornell/";
ext = "png";
reverseUP = false;
break;
+ case 5:
+ name = "cubemaps/skycube/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
+ case 6:
+ name = "cubemaps/SaintLazarusChurch3/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
+ case 7:
+ name = "cubemaps/Sodermalmsallen/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
+ case 8:
+ name = "cubemaps/Sodermalmsallen2/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
+ case 9:
+ name = "cubemaps/UnionSquare/";
+ ext = "jpg";
+ reverseUP = false;
+ break;
default:
- name = "cubemaps/rgb_";
- ext = "png"; /*mipmap = true;*/ reverseUP = false;
+ name = "cubemaps/box/";
+ ext = "png"; /*mipmap = true;*/
+ reverseUP = false;
break;
}
-
- try
- {
- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
- } catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+
+ LoadSkybox(name, ext, mipmap);
}
public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
@@ -9281,8 +9314,13 @@
static double[] model = new double[16];
double[] camera2light = new double[16];
double[] light2camera = new double[16];
- int newenvy = -1;
+
+ //int newenvy = -1;
boolean envyoff = true; // false;
+ String skyboxname = "";
+ String skyboxext;
+ String loadedskyboxname = "";
+
cVector light0 = new cVector(0, 0, 0); // 1,3,2);
//float[] light0 = { 0,0,0 };
cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
@@ -9762,10 +9800,12 @@
rati = 1 / rati;
gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
}
- assert (newenvy == -1);
+
+ //assert (newenvy == -1);
+
gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
- DrawSkyBox(gl);
+ DrawSkyBox(gl, (float)rati);
gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
accPerspective(gl, renderCamera.shaper_fovy / ratio,
@@ -11018,13 +11058,19 @@
gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
}
- if (newenvy > -1)
+// if (newenvy > -1)
+// {
+// LoadEnvy(newenvy);
+// }
+//
+// newenvy = -1;
+
+ if (!skyboxname.equals(this.loadedskyboxname))
{
- LoadEnvy(newenvy);
+ LoadSkybox(skyboxname + "/", skyboxext, false);
+ loadedskyboxname = skyboxname;
}
-
- newenvy = -1;
-
+
ratio = ((double) getWidth()) / getHeight();
//System.out.println("ratio = " + ratio);
@@ -11040,7 +11086,7 @@
if (!IsFrozen() && !ambientOcclusion)
{
- DrawSkyBox(gl);
+ DrawSkyBox(gl, (float)ratio);
}
//if (selection_view == -1)
@@ -12400,7 +12446,7 @@
//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
- String program =
+ String program0 =
// Min shader
"!!ARBfp1.0\n" +
"PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
@@ -12451,7 +12497,8 @@
//"SUB ndotl.y, zero123.y, ndotl.y;" +
//"MUL ndotl.y, ndotl.y, pow2.z;" +
- "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
// Pigment
"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
@@ -12466,7 +12513,7 @@
"MOV result.color, temp;" +
"END";
- String program2 =
+ String program =
"!!ARBfp1.0\n" +
//"OPTION ARB_fragment_program_shadow;" +
@@ -15321,14 +15368,18 @@
case '3':
case '4':
case '5':
- newenvy = Character.getNumericValue(key);
- repaint();
- break;
case '6':
case '7':
case '8':
case '9':
- BGcolor = (key - '6')/3.f;
+ if (envyoff)
+ {
+ BGcolor = (key - '1')/8.f;
+ }
+ else
+ {
+ //newenvy = Character.getNumericValue(key);
+ }
repaint();
break;
case '!':
@@ -16551,7 +16602,9 @@
float BGcolor = 0.5f;
- private void DrawSkyBox(GL gl)
+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
+
+ private void DrawSkyBox(GL gl, float ratio)
{
if (envyoff || cubemap == null)
{
@@ -16568,7 +16621,17 @@
// Compensates for ExaminerViewer's modification of modelview matrix
gl.glMatrixMode(GL.GL_MODELVIEW);
gl.glLoadIdentity();
+ gl.glScalef(1,ratio,1);
+ colorV[0] = 2;
+ colorV[1] = 2;
+ colorV[2] = 2;
+ colorV[3] = 1;
+ gl.glDisable(gl.GL_COLOR_MATERIAL);
+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
+
+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
+
//gl.glActiveTexture(GL.GL_TEXTURE1);
//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
@@ -16581,7 +16644,7 @@
// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
// causes the normals to be sent down. Thanks to Ken Dyke.
//gl.glEnable(GL.GL_LIGHTING);
- gl.glDisable(GL.GL_LIGHTING);
+ gl.glEnable(GL.GL_LIGHTING);
gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
@@ -16858,7 +16921,7 @@
//new Exception().printStackTrace();
System.out.println("select buffer init");
// Use debug pipeline
- drawable.setGL(new DebugGL(drawable.getGL()));
+ //drawable.setGL(new DebugGL(drawable.getGL()));
GL gl = drawable.getGL();
--
Gitblit v1.6.2