From e36047725ce3217618d4e5807ac7c8769b9e3598 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 17 Jun 2019 19:45:55 -0400
Subject: [PATCH] Split pigment bump.
---
CameraPane.java | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 254 insertions(+), 45 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 830f914..99e2648 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -150,6 +150,8 @@
defaultcaps.setAccumAlphaBits(16);
}
+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
+
void SetAsGLRenderer(boolean b)
{
isRenderer = b;
@@ -462,7 +464,7 @@
if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
{
//gl.glBegin(gl.GL_TRIANGLES);
- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 || pv.norm.y != 0 || pv.norm.z != 0);
if (!hasnorm)
{
// System.out.println("FUCK!!");
@@ -1888,7 +1890,7 @@
void PushMatrix(double[][] matrix)
{
// GrafreeD.tracein(matrix);
- PushMatrix(matrix,1);
+ PushMatrix(matrix, 1);
}
void PushMatrix()
@@ -2265,7 +2267,7 @@
LOOKAT ^= true;
}
- void ToggleRandom()
+ void ToggleSwitch()
{
SWITCH ^= true;
}
@@ -2374,7 +2376,7 @@
{
return currentGL;
}
-
+
/**/
class CacheTexture
{
@@ -7919,6 +7921,64 @@
ReleaseTexture(pigment, false);
}
+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
+ {
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
+ {
+ return;
+ }
+
+ if (tex == null)
+ {
+ ReleaseTexture(null, false);
+ return;
+ }
+
+ String pigment = Object3D.GetPigment(tex);
+
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ {
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
+ // System.out.println("; bump = " + bump);
+ }
+
+ if (pigment.equals(""))
+ {
+ pigment = null;
+ }
+
+ ReleaseTexture(pigment, false);
+ }
+
+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
+ {
+ if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
+ {
+ return;
+ }
+
+ if (tex == null)
+ {
+ ReleaseTexture(null, true);
+ return;
+ }
+
+ String bump = Object3D.GetBump(tex);
+
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ {
+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
+ // System.out.println("; bump = " + bump);
+ }
+
+ if (bump.equals(""))
+ {
+ bump = null;
+ }
+
+ ReleaseTexture(bump, true);
+ }
+
void ReleaseTexture(String tex, boolean bump)
{
if (// DrawMode() != 0 || /*tex == null ||*/
@@ -8022,7 +8082,7 @@
}
}
- /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
+ /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
{
if (// DrawMode() != 0 || /*tex == null ||*/
ambientOcclusion ) // || !textureon)
@@ -8067,7 +8127,94 @@
return; // true;
}
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
+ /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
+ {
+ if (// DrawMode() != 0 || /*tex == null ||*/
+ ambientOcclusion ) // || !textureon)
+ {
+ return; // false;
+ }
+
+ if (tex == null)
+ {
+ BindTexture(null,false,resolution);
+ return;
+ }
+
+ String pigment = Object3D.GetPigment(tex);
+
+ usedtextures.put(pigment, pigment);
+
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ {
+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
+ // System.out.println("; bump = " + bump);
+ }
+
+ if (pigment.equals(""))
+ {
+ pigment = null;
+ }
+
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
+ BindTexture(pigment, false, resolution);
+ }
+
+ /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
+ {
+ if (// DrawMode() != 0 || /*tex == null ||*/
+ ambientOcclusion ) // || !textureon)
+ {
+ return; // false;
+ }
+
+ if (tex == null)
+ {
+ BindTexture(null,true,resolution);
+ return;
+ }
+
+ String bump = Object3D.GetBump(tex);
+
+ usedtextures.put(bump, bump);
+
+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ {
+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
+ // System.out.println("; bump = " + bump);
+ }
+
+ if (bump.equals(""))
+ {
+ bump = null;
+ }
+
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
+ BindTexture(bump, true, resolution);
+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
+ }
+
+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
+
+ private boolean FileExists(String tex)
+ {
+ if (missingTextures.contains(tex))
+ {
+ return false;
+ }
+
+ boolean fileExists = new File(tex).exists();
+
+ if (!fileExists)
+ {
+ // If file exists, the "new File()" is not executed sgain
+ missingTextures.add(tex);
+ }
+
+ return fileExists;
+ }
+
+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
{
CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
@@ -8075,15 +8222,17 @@
{
String texname = tex;
+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
+
// String[] split = tex.split("Textures");
// if (split.length > 1)
// texname = "/Users/nbriere/Textures" + split[split.length-1];
// else
// if (!texname.startsWith("/"))
// texname = "/Users/nbriere/Textures/" + texname;
- if (!new File(tex).exists())
+ if (!FileExists(tex))
{
- texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
+ texname = fallbackTextureName;
}
if (CACHETEXTURE)
@@ -8153,7 +8302,7 @@
}
cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
- if (!new File(cachename).exists())
+ if (!FileExists(cachename))
cachename = texname;
else
processbump = false; // don't process bump map again
@@ -8175,7 +8324,7 @@
}
cachename = texname.substring(0, texname.length()-4)+ext+".png";
- if (!new File(cachename).exists())
+ if (!FileExists(cachename))
cachename = texname;
else
processbump = false; // don't process bump map again
@@ -8184,7 +8333,9 @@
texturedata = GetFileTexture(cachename, processbump, resolution);
- if (texturedata != null)
+ if (texturedata == null)
+ throw new Exception();
+
texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
//texture = GetTexture(tex, bump);
}
@@ -8306,7 +8457,7 @@
return texture;
}
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
{
CacheTexture texture = GetCacheTexture(tex, bump, resolution);
@@ -8324,14 +8475,14 @@
return texture!=null?texture.texture:null;
}
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
{
CacheTexture texture = GetCacheTexture(tex, bump, resolution);
return texture!=null?texture.texturedata:null;
}
- boolean BindTexture(String tex, boolean bump, int resolution)
+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
{
if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
{
@@ -9308,8 +9459,8 @@
assert (parentcam != renderCamera);
if (renderCamera != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(matrix, parentcam.toParent, matrix);
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
@@ -9324,8 +9475,8 @@
LA.matCopy(renderCamera.fromScreen, matrix);
if (renderCamera != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(parentcam.fromParent, matrix, matrix);
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
@@ -10390,13 +10541,13 @@
ambientOcclusion = false;
}
- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
{
//if (RENDERSHADOW) // ?
if (!IsFrozen())
{
// dec 2012
- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
{
Globals.framecount++;
shadowbuffer.display();
@@ -10523,8 +10674,8 @@
// if (parentcam != renderCamera) // not a light
if (cam != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(matrix, parentcam.toParent, matrix);
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
for (int j = 0; j < 4; j++)
{
@@ -10538,8 +10689,8 @@
// if (parentcam != renderCamera) // not a light
if (cam != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(parentcam.fromParent, matrix, matrix);
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
@@ -10798,7 +10949,16 @@
// Bump noise
gl.glActiveTexture(GL.GL_TEXTURE6);
//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
- BindTexture(NOISE_TEXTURE, false, 2);
+
+ try
+ {
+ BindTexture(NOISE_TEXTURE, false, 2);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAILED: " + NOISE_TEXTURE);
+ }
+
gl.glActiveTexture(GL.GL_TEXTURE0);
gl.glEnable(GL.GL_TEXTURE_2D);
@@ -10923,8 +11083,8 @@
System.err.println("parentcam != renderCamera");
// if (cam != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
}
LA.xformDir(lightposition, cam.toScreen, lightposition);
@@ -10945,8 +11105,8 @@
if (true) // TODO
{
if (cam != lightCamera)
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
}
LA.xformPos(light0, cam.toScreen, light0);
@@ -11354,7 +11514,14 @@
usedtextures.clear();
- BindTextures(DEFAULT_TEXTURES, 2);
+ try
+ {
+ BindTextures(DEFAULT_TEXTURES, 2);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
+ }
}
//System.out.println("--> " + stackdepth);
// GrafreeD.traceon();
@@ -11445,7 +11612,14 @@
if (checker != null && DrawMode() == DEFAULT)
{
//BindTexture(IMMORTAL_TEXTURE);
- BindTextures(checker.GetTextures(), checker.texres);
+ try
+ {
+ BindTextures(checker.GetTextures(), checker.texres);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAILED: " + checker.GetTextures());
+ }
// NEAREST
GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
DrawChecker(gl);
@@ -11527,7 +11701,7 @@
return;
}
- String string = obj.GetToolTip();
+ String string = obj.toString(); //.GetToolTip();
GL gl = GetGL();
@@ -11844,8 +12018,8 @@
//obj.TransformToWorld(light, light);
for (int i = tp.size(); --i >= 0;)
{
- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
- LA.xformPos(light, tp.get(i).toParent, light);
+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
}
@@ -11862,8 +12036,8 @@
parentcam = cameras[0];
}
- for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformPos(light, parentcam.toParent, light); // may 2013
+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
LA.xformPos(light, renderCamera.toScreen, light);
@@ -12477,8 +12651,8 @@
// display shadow only (bump == 0)
"SUB temp.x, half.x, shadow.x;" +
- "MOV temp.y, -params6.x;" +
- "SLT temp.z, temp.y, zero.x;" +
+ "MOV temp.y, -params5.z;" + // params6.x;" +
+ "SLT temp.z, temp.y, -one2048th.x;" +
"SUB temp.y, one.x, temp.z;" +
"MUL temp.x, temp.x, temp.y;" +
"KIL temp.x;" +
@@ -12809,7 +12983,7 @@
//once = true;
}
- System.out.print("Program #" + mode + "; length = " + program.length());
+ 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);
@@ -12942,12 +13116,16 @@
"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
+
+ // Compare fragment depth in light space with shadowmap.
"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
"SGE temp.y, temp.x, zero.x;" +
- "SUB " + shadow + ".y, one.x, temp.y;" +
+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
+
+ // Reverse comparison
"SUB temp.x, one.x, temp.x;" +
"MUL " + shadow + ".x, temp.x, temp.y;" +
- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
@@ -12961,6 +13139,10 @@
// No shadow for backface
"DP3 temp.x, normal, lightd;" +
"SLT temp.x, temp.x, zero.x;" + // shadoweps
+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
+
+ // No shadow when out of frustrum
+ "SGE temp.x, " + depth + ".z, one.z;" +
"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
"";
}
@@ -13776,9 +13958,12 @@
public void mouseDragged(MouseEvent e)
{
+ Globals.MOUSEDRAGGED = true;
+
//System.out.println("mouseDragged: " + e);
if (isRenderer)
movingcamera = true;
+
//if (drawing)
//return;
if ((e.getModifiersEx() & CTRL) != 0
@@ -14340,7 +14525,10 @@
public void mouseReleased(MouseEvent e)
{
+ Globals.MOUSEDRAGGED = false;
+
movingcamera = false;
+ X = Y = 0;
//System.out.println("mouseReleased: " + e);
clickEnd(e.getX(), e.getY(), e.getModifiersEx());
}
@@ -14870,7 +15058,7 @@
//RESIZETEXTURE ^= true;
//break;
case 'z':
- RENDERSHADOW ^= true;
+ Globals.RENDERSHADOW ^= true;
Globals.lighttouched = true;
repaint();
break;
@@ -15349,7 +15537,9 @@
info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
//Image img = CreateImage(width, height);
//System.out.println("width = " + width + "; height = " + height + "\n");
+
Graphics gr = g; // img.getGraphics();
+
if (!hasMarquee)
{
if (Xmin < Xmax) // !locked)
@@ -15447,14 +15637,33 @@
if (!isRenderer)
{
object.drawEditHandles(info, 0);
+
+ if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
+ {
+ switch (object.selection.get(0).hitSomething)
+ {
+ case Object3D.hitCenter: gr.setColor(Color.pink);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ break;
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ break;
+ case Object3D.hitScale: gr.setColor(Color.cyan);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ break;
+ }
+
+ }
}
}
+
if (isRenderer)
{
//gr.setColor(Color.black);
//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
}
+
if (hasMarquee)
{
gr.setXORMode(Color.white);
@@ -15861,7 +16070,7 @@
Object3D object;
static Object3D trackedobject;
Camera renderCamera; // Light or Eye (or Occlusion)
- /*static*/ Camera manipCamera; // Light or Eye
+ /*static*/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
/*static*/ Camera eyeCamera;
/*static*/ Camera lightCamera;
int cameracount;
@@ -16592,7 +16801,7 @@
gl.glDisable(gl.GL_CULL_FACE);
}
- if (!RENDERSHADOW)
+ if (!Globals.RENDERSHADOW)
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
// SB gl.glPolygonOffset(2.5f, 10);
@@ -16602,7 +16811,7 @@
//gl.glColorMask(false, false, false, false);
//render_scene_from_light_view(gl, drawable, 0, 0);
- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
{
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
--
Gitblit v1.6.2