From 0cdf3fb57ddea3226f094ba45c836c7e9b123e3a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 13 Aug 2019 10:33:05 -0400
Subject: [PATCH] No background
---
CameraPane.java | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 28924e5..df28651 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -173,7 +173,7 @@
static boolean doublesided = false; // true; // reversed normals are awful for conformance
boolean anisotropy = true;
boolean softshadow = true; // slower but better false;
- boolean opacityhalo = false;
+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
boolean macromode = false;
@@ -8358,7 +8358,7 @@
// else
// if (!texname.startsWith("/"))
// texname = "/Users/nbriere/Textures/" + texname;
- if (!FileExists(texname))
+ if (!FileExists(texname) && !texname.startsWith("@"))
{
texname = fallbackTextureName;
}
@@ -8441,6 +8441,15 @@
new Exception().printStackTrace();
} else
{
+ if (texname.startsWith("@"))
+ {
+ // texturecache = textures.get(texname); // suspicious
+ if (texturecache == null)
+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
+ else
+ new Exception().printStackTrace();
+ } else
+ {
if (textureon)
{
String cachename = texname;
@@ -8500,6 +8509,7 @@
texturecache = new CacheTexture(texturedata,resolution);
//texture = GetTexture(tex, bump);
}
+ }
}
//}
}
@@ -8768,10 +8778,12 @@
gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
MAXSTACK = temp[0];
- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
+ if (Globals.DEBUG)
+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
MAXSTACK = temp[0];
- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
+ if (Globals.DEBUG)
+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
// Use debug pipeline
//drawable.setGL(new DebugGL(gl)); //
@@ -8779,7 +8791,8 @@
gl = drawable.getGL(); //
GL gl3 = getGL();
- System.out.println("INIT GL IS: " + gl.getClass().getName());
+ if (Globals.DEBUG)
+ System.out.println("INIT GL IS: " + gl.getClass().getName());
//float pos[] = { 100, 100, 100, 0 };
@@ -10841,7 +10854,7 @@
if (wait)
{
- Sleep(500);
+ Sleep(200); // blocks everything
wait = false;
}
@@ -11379,7 +11392,7 @@
// if (cam != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
}
LA.xformDir(lightposition, cam.toScreen, lightposition);
@@ -12453,7 +12466,7 @@
//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
- String program0 =
+ String programmin =
// Min shader
"!!ARBfp1.0\n" +
"PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
@@ -12520,7 +12533,7 @@
"MOV result.color, temp;" +
"END";
- String program =
+ String programmax =
"!!ARBfp1.0\n" +
//"OPTION ARB_fragment_program_shadow;" +
@@ -13376,6 +13389,13 @@
//once = true;
}
+ String program = programmax;
+
+ if (Globals.MINSHADER)
+ {
+ program = programmin;
+ }
+
System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
@@ -14625,9 +14645,9 @@
MODIFIERS |= COMMAND;
/**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(0, -speed);
- else
manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
+ else
+ manipCamera.RotatePosition(0, -speed);
/**/
if ((mod & SHIFT) == SHIFT)
{
@@ -14646,9 +14666,9 @@
MODIFIERS |= COMMAND;
/**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(0, speed);
- else
manipCamera.BackForth(0, speed*delta, 0); // getWidth());
+ else
+ manipCamera.RotatePosition(0, speed);
/**/
if ((mod & SHIFT) == SHIFT)
{
@@ -16091,7 +16111,7 @@
gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
break;
case Object3D.hitScale: gr.setColor(Color.cyan);
- gr.drawLine(X, Y, 0, 0);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
break;
}
@@ -16650,6 +16670,7 @@
private void DrawSkyBox(GL gl, float ratio)
{
if (//envyoff ||
+ WIREFRAME ||
cubemap == null)
{
gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
@@ -16667,14 +16688,14 @@
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);
+// 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);
@@ -16688,7 +16709,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.glEnable(GL.GL_LIGHTING);
+ gl.glDisable(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);
@@ -17512,10 +17533,14 @@
gl.glFlush();
/**/
- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
- float[] pixels = occlusionsizebuffer.array();
+ float[] depths = occlusiondepthbuffer.array();
+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
+
+ int[] pixels = selectsizebuffer.array();
+
double r = 0, g = 0, b = 0;
double count = 0;
@@ -17526,7 +17551,7 @@
double FACTOR = 1;
- for (int i = 0; i < pixels.length; i++)
+ for (int i = 0; i < depths.length; i++)
{
int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
@@ -17609,7 +17634,7 @@
double scale = ray.z; // 1; // cos
- float depth = pixels[newindex];
+ float depth = depths[newindex];
/*
int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
@@ -17806,11 +17831,14 @@
static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
static IntBuffer bigAAbuffer;
static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
+
+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
+
static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
--
Gitblit v1.6.2