From 51e45bf615e1e2b4aca2edf9f7333b687c7d015e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 24 Sep 2019 21:07:45 -0400
Subject: [PATCH] Remove hands.
---
CameraPane.java | 2306 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 1,738 insertions(+), 568 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index b4be4fc..b558c23 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -1,4 +1,5 @@
+import com.bulletphysics.dynamics.RigidBody;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.*;
@@ -18,7 +19,10 @@
import javax.imageio.ImageIO;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
+import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import javax.imageio.ImageWriteParam;
@@ -30,6 +34,7 @@
import java.nio.*;
import gleem.linalg.Mat4f;
+import javax.imageio.ImageTypeSpecifier;
class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
{
@@ -37,7 +42,6 @@
static boolean[] selectedstack = new boolean[65536];
static int materialdepth = 0;
- static boolean DEBUG = false;
static boolean FRUSTUM = false; // still bogus true; // frustum culling
// camera change fix
@@ -45,6 +49,39 @@
static boolean ABORTED = false;
static int STEP = 1;
+
+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
+ {
+ int[] pixels = new int[bytes.length/3];
+ for (int i=pixels.length; --i>=0;)
+ {
+ int i3 = i*3;
+ pixels[i] = 0xFF;
+ pixels[i] <<= 8;
+ pixels[i] |= bytes[i3+2] & 0xFF;
+ pixels[i] <<= 8;
+ pixels[i] |= bytes[i3+1] & 0xFF;
+ pixels[i] <<= 8;
+ pixels[i] |= bytes[i3] & 0xFF;
+ }
+ /*
+ int r=0,g=0,b=0,a=0;
+ for (int i=0; i<width; i++)
+ for (int j=0; j<height; j++)
+ {
+ int index = j*width+i;
+ int p = pixels[index];
+ a = ((p>>24) & 0xFF);
+ r = ((p>>16) & 0xFF);
+ g = ((p>>8) & 0xFF);
+ b = (p & 0xFF);
+ pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
+ }
+ /**/
+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
+ return rendImage;
+ }
/*static*/ private boolean CULLFACE = false; // true;
/*static*/ boolean NEAREST = false; // true;
@@ -61,7 +98,7 @@
//boolean REDUCETEXTURE = true;
boolean CACHETEXTURE = true;
boolean CLEANCACHE = false; // true;
- boolean MIPMAP = false; // true;
+ boolean MIPMAP = false; // true; // never works...
boolean COMPRESSTEXTURE = false;
boolean KOMPACTTEXTURE = false; // true;
boolean RESIZETEXTURE = false;
@@ -74,7 +111,11 @@
//private Mat4f spotlightTransform = new Mat4f();
//private Mat4f spotlightInverseTransform = new Mat4f();
static GLContext glcontext = null;
- /*static*/ com.sun.opengl.util.texture.Texture cubemap;
+ /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
+ /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
+ /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
+ boolean transformMode;
+
boolean reverseUP = false;
static boolean frozen = false;
boolean enablebackspace = false; // patch for back buffer refresh
@@ -94,7 +135,7 @@
static boolean ZOOMBOXMODE = false;
static boolean BOXMODE = false;
static boolean IMAGEFLIP = false;
-static boolean SMOOTHFOCUS = false;
+static boolean SMOOTHFOCUS = true; // false;
static boolean SPEAKERMOCAP = true; // jan 2014 false;
static boolean SPEAKERCAMERA = false;
static boolean SPEAKERFOCUS = false;
@@ -128,16 +169,16 @@
// OPTIONS
- boolean Skinshader = true;
+ boolean Skinshader = false; // true;
boolean cameraLight = false;
boolean UVdebug = false;
boolean Udebug = false;
boolean Vdebug = false;
boolean NORMALdebug = false;
- static boolean doublesided = false; // true; // reversed normals are awful for conformance
+ static boolean doublesided = true; // false; // 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;
@@ -151,6 +192,19 @@
}
private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
+
+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
+ {
+ try
+ {
+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
+ } catch (IOException e)
+ {
+ System.out.println("NAME = " + name);
+ e.printStackTrace(); // throw new RuntimeException(e);
+ return null;
+ }
+ }
void SetAsGLRenderer(boolean b)
{
@@ -168,9 +222,10 @@
cameras = new Camera[2];
targetLookAts = new cVector[2];
- SetCamera(cam);
+ SetCamera(cam, true);
- SetLight(new Camera(new cVector(10, 10, -20)));
+ // Warning: not used.
+ //SetLight(new Camera(new cVector(15, 10, -20)));
object = o;
@@ -327,7 +382,7 @@
cStatic.objectstack[materialdepth++] = obj;
//System.out.println("material " + material);
//Applet3D.tracein(this, selected);
- display.vector2buffer = obj.projectedVertices;
+ //display.vector2buffer = obj.projectedVertices;
if (obj instanceof Camera)
{
display.options1[0] = material.shift;
@@ -336,14 +391,28 @@
display.options1[2] = material.shadowbias;
display.options1[3] = material.aniso;
display.options1[4] = material.anisoV;
+// System.out.println("display.options1[0] " + display.options1[0]);
+// System.out.println("display.options1[1] " + display.options1[1]);
+// System.out.println("display.options1[2] " + display.options1[2]);
+// System.out.println("display.options1[3] " + display.options1[3]);
+// System.out.println("display.options1[4] " + display.options1[4]);
display.options2[0] = material.opacity;
display.options2[1] = material.diffuse;
display.options2[2] = material.factor;
+// System.out.println("display.options2[0] " + display.options2[0]);
+// System.out.println("display.options2[1] " + display.options2[1]);
+// System.out.println("display.options2[2] " + display.options2[2]);
cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
+// System.out.println("display.options3[0] " + display.options3[0]);
+// System.out.println("display.options3[1] " + display.options3[1]);
+// System.out.println("display.options3[2] " + display.options3[2]);
display.options4[0] = material.cameralight/0.2f;
display.options4[1] = material.subsurface;
display.options4[2] = material.sheen;
+// System.out.println("display.options4[0] " + display.options4[0]);
+// System.out.println("display.options4[1] " + display.options4[1]);
+// System.out.println("display.options4[2] " + display.options4[2]);
// if (display.CURRENTANTIALIAS > 0)
// display.options3[3] /= 4;
@@ -359,7 +428,7 @@
/**/
} else
{
- DrawMaterial(material, selected);
+ DrawMaterial(material, selected, obj.projectedVertices);
}
} else
{
@@ -383,8 +452,8 @@
cStatic.objectstack[materialdepth++] = obj;
//System.out.println("material " + material);
//Applet3D.tracein("selected ", selected);
- display.vector2buffer = obj.projectedVertices;
- display.DrawMaterial(material, selected);
+ //display.vector2buffer = obj.projectedVertices;
+ display.DrawMaterial(material, selected, obj.projectedVertices);
}
}
@@ -401,8 +470,8 @@
materialdepth -= 1;
if (materialdepth > 0)
{
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
}
//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
@@ -422,8 +491,8 @@
materialdepth -= 1;
if (materialdepth > 0)
{
- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
}
//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
//else
@@ -464,15 +533,18 @@
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)
+ // TEST LIVE NORMALS && !obj.dontselect
+ ;
if (!hasnorm)
{
- // System.out.println("FUCK!!");
+ // System.out.println("Mesh normal");
LA.vecSub(pv/*.pos*/, qv/*.pos*/, obj.v0);
LA.vecSub(pv/*.pos*/, rv/*.pos*/, obj.v1);
LA.vecCross(obj.v0, obj.v1, obj.v2);
LA.vecNormalize(obj.v2);
- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
+
+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
}
// P
@@ -494,7 +566,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
SetColor(obj, pv);
@@ -526,7 +598,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
//System.out.println("vertexq = " + qv.s + ", " + qv.t);
// boolean locked = false;
@@ -574,7 +646,7 @@
y += ny * obj.NORMALPUSH;
z += nz * obj.NORMALPUSH;
- gl.glNormal3f(nx, ny, nz);
+ SetGLNormal(gl, nx, ny, nz);
}
// if ((dot&4) == 0)
@@ -810,7 +882,7 @@
//// tris.postdraw(this);
}
- static Camera localcamera = new Camera();
+ static Camera localAOcamera = new Camera();
static cVector from = new cVector();
static cVector to = new cVector();
@@ -819,7 +891,7 @@
CameraPane cp = this;
Camera keep = cp.RenderCamera();
- cp.renderCamera = localcamera;
+ cp.renderCamera = localAOcamera;
if (br.trimmed)
{
@@ -837,7 +909,7 @@
br.positions[i3 + 2] + br.normals[i3 + 2]);
LA.xformPos(from, transform, from);
LA.xformPos(to, transform, to); // RIGID ONLY
- localcamera.setAim(from, to);
+ localAOcamera.setAim(from, to);
CameraPane.occlusionbuffer.display();
@@ -871,7 +943,7 @@
to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
LA.xformPos(from, transform, from);
LA.xformPos(to, transform, to); // RIGID ONLY
- localcamera.setAim(from, to);
+ localAOcamera.setAim(from, to);
CameraPane.occlusionbuffer.display();
@@ -1180,10 +1252,10 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
@@ -1192,10 +1264,12 @@
gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
}
}
+
if (flipV)
gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
else
gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
+
//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
@@ -1205,20 +1279,22 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
{
gl.glColor4f(c[count3/3], c[count3/3 /* + 1*/], c[count3/3 /* + 2*/], 1);
}
}
+
if (flipV)
gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
else
gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
+
//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
@@ -1231,10 +1307,10 @@
{
if (n[count3] != 0 || n[count3 + 1] != 0 || n[count3 + 2] != 0)
{
- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
} else
{
- gl.glNormal3f(0, 0, 1);
+ SetGLNormal(gl, 0, 0, 1);
}
if (c != null)
{
@@ -1246,8 +1322,10 @@
gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
else
gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
+
//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
+
count2 += 2;
count3 += 3;
}
@@ -1414,7 +1492,7 @@
{
if (!selectmode)
{
- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
if (flipV)
@@ -1426,6 +1504,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;
@@ -1493,8 +1573,6 @@
{
return;
}
-
- float[] colorV = new float[3];
if (false) // marked)
{
@@ -1603,7 +1681,7 @@
// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
}
- void DrawMaterial(cMaterial material, boolean selected)
+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
{
CameraPane display = this;
//new Exception().printStackTrace();
@@ -1638,7 +1716,7 @@
colorV[0] = display.modelParams0[0] * material.diffuse;
colorV[1] = display.modelParams0[1] * material.diffuse;
colorV[2] = display.modelParams0[2] * material.diffuse;
- colorV[3] = material.opacity;
+ colorV[3] = 1; // material.opacity;
gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
//System.out.println("Opacity = " + opacity);
@@ -1743,12 +1821,12 @@
display.modelParams7[0] = 0;
display.modelParams7[1] = 1000;
- display.modelParams7[2] = 0;
+ display.modelParams7[2] = material.parallax;
display.modelParams7[3] = 0;
- display.modelParams6[0] = 100; // criss de bug de bump
+ //display.modelParams6[0] = 100; // criss de bug de bump
- Object3D.cVector2[] extparams = display.vector2buffer;
+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
if (extparams != null && extparams.length > 0 && extparams[0] != null)
{
display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
@@ -1890,7 +1968,7 @@
void PushMatrix(double[][] matrix)
{
// GrafreeD.tracein(matrix);
- PushMatrix(matrix,1);
+ PushMatrix(matrix, 1);
}
void PushMatrix()
@@ -1976,9 +2054,9 @@
switch(viewcode)
{
case 0: return "main";
- case 1: return "one";
- case 2: return "two";
- case 3: return "three";
+ case 1: return "Red";
+ case 2: return "Green";
+ case 3: return "Blue";
case 4: return "light";
}
@@ -1987,7 +2065,7 @@
static int camerachangeframe;
- public boolean SetCamera(Camera cam)
+ public boolean SetCamera(Camera cam, boolean set)
{
// may 2014 if (cam == cameras[0] || cam == cameras[1])
// return false;
@@ -2005,7 +2083,8 @@
camerachangeframe = Globals.framecount;
- cam.hAspect = -1; // Read only
+ if (cam != null)
+ cam.hAspect = -1; // Read only
cameras[0] = cam;
targetLookAts[0] = new cVector(cam.lookAt);
@@ -2015,11 +2094,14 @@
{
cameras[i] = new Camera(cam.viewCode);
}
-
- cameras[i].setAim(cam.location, cam.lookAt);
- cameras[i].shaper_fovy = cam.shaper_fovy;
- cameras[i].UP.set(cam.UP);
- targetLookAts[i] = new cVector(cameras[i].lookAt);
+
+ if (set)
+ {
+ cameras[i].setAim(cam.location, cam.lookAt);
+ cameras[i].shaper_fovy = cam.shaper_fovy;
+ cameras[i].UP.set(cam.UP);
+ targetLookAts[i] = new cVector(cameras[i].lookAt);
+ }
}
cameracount = 0;
targetLookAt = targetLookAts[cameracount];
@@ -2028,7 +2110,7 @@
// Start with free camera
SwitchCameras(true);
- pingthread.jump = true; // optional?
+// pingthread.jump = true; // optional?
if (TRACKONCE)
{
@@ -2044,7 +2126,7 @@
//System.err.println("Oeil on");
OEIL = true;
if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
//pingthread.StepToTarget(true);
}
@@ -2215,18 +2297,6 @@
public void ToggleTrack()
{
TRACK ^= true;
- if (TRACK)
- {
- if (object.selection != null &&
- object.selection.size() > 0 &&
- object.selection.elementAt(0) != null &&
- !(object.selection.elementAt(0) instanceof Camera) &&
- !(object.selection.elementAt(0) instanceof ScriptNode))
- {
- trackedobject = object.selection.elementAt(0);
- repaint();
- }
- }
repaint();
}
@@ -2259,7 +2329,7 @@
void ToggleDebug()
{
- DEBUG ^= true;
+ Globals.DEBUG ^= true;
}
void ToggleLookAt()
@@ -2277,10 +2347,17 @@
HANDLES ^= true;
}
+ Object3D paintFolder;
+
void TogglePaint()
{
PAINTMODE ^= true;
paintcount = 0;
+
+ if (PAINTMODE)
+ {
+ paintFolder = GetFolder();
+ }
}
void SwapCamera(int a, int b)
@@ -2311,7 +2388,8 @@
{
//System.out.println("PROTECTION = " + cam.hAspect);
//assert (cam.hAspect == 0);
- cam.hAspect = 0;
+ if (cam != null)
+ cam.hAspect = 0;
lightCamera = cam;
}
@@ -2377,6 +2455,33 @@
return currentGL;
}
+ static private BufferedImage CreateBim(TextureData texturedata)
+ {
+ Grafreed.Assert(texturedata != null);
+
+ int width = texturedata.getWidth();
+ int height = texturedata.getHeight();
+
+ Buffer buffer = texturedata.getBuffer();
+ ByteBuffer bytebuf = (ByteBuffer)buffer;
+
+ byte[] bytes = bytebuf.array();
+
+ return CreateBim(bytes, width, height);
+ }
+
+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
+ {
+ gl.glNormal3f(nx, ny, nz);
+
+ if (ny > 0.9 || ny < -0.9)
+ // Ground or ceiling
+ gl.glVertexAttrib3f(4, 1, 0, 0);
+ else
+ // Walls
+ gl.glVertexAttrib3f(4, 0, 1, 0);
+ }
+
/**/
class CacheTexture
{
@@ -2385,28 +2490,31 @@
int resolution;
- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
{
- texture = tex;
+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
+ texturedata = texdata;
resolution = res;
}
}
/**/
// TEXTURE static Texture texture;
- static public java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/> textures
- = new java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/>();
- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
+
int pigmentdepth = 0;
public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
int bumpdepth = 0;
public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
- public static String NOISE_TEXTURE = "WHITE_NOISE";
+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
{
TextureData texturedata = null;
@@ -2416,7 +2524,7 @@
com.sun.opengl.util.texture.TextureIO.newTextureData(
getClass().getClassLoader().getResourceAsStream(name),
true,
- com.sun.opengl.util.texture.TextureIO.PNG);
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
} catch (java.io.IOException e)
{
throw new javax.media.opengl.GLException(e);
@@ -2425,13 +2533,34 @@
if (bump)
texturedata = ConvertBump(texturedata, false);
- com.sun.opengl.util.texture.Texture texture =
- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
+// com.sun.opengl.util.texture.Texture texture =
+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
- return texture;
+ return texturedata;
+ }
+
+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
+ {
+ TextureData texturedata = null;
+
+ try
+ {
+ texturedata =
+ com.sun.opengl.util.texture.TextureIO.newTextureData(
+ bim,
+ true);
+ } catch (Exception e)
+ {
+ throw new javax.media.opengl.GLException(e);
+ }
+
+ if (bump)
+ texturedata = ConvertBump(texturedata, false);
+
+ return texturedata;
}
boolean HUESMOOTH = true; // wrap around bug... true;
@@ -3461,6 +3590,8 @@
};
/**/
+ static Object3D lastObject;
+
//com.sun.opengl.util.texture.Texture
TextureData
GetFileTexture(String name, boolean bump, int resolution)
@@ -3497,6 +3628,8 @@
// return null;
//if (i == 2)
// return null;
+ // TIFF issue sept 2019
+ System.err.println("lastObject = " + lastObject);
e.printStackTrace();
name = name.split("\\.tif")[0] + ".jpg";
}
@@ -3504,6 +3637,8 @@
System.out.println("LOADING TEXTURE : " + name);
+ Object x = texturedata.getMipmapData(); // .getBuffer();
+
//
if (false) // compressbit > 0)
{
@@ -6827,30 +6962,30 @@
short residu = 0;
// wraparound workarounds
- short fuck = (short) (buffer[i] & 0xFF);
+ short ww = (short) (buffer[i] & 0xFF);
/*
- residu += (fuck%2);
- if(fuck/2 < 256-residu/2)
+ residu += (ww%2);
+ if(ww/2 < 256-residu/2)
{
- fuck = (short)((fuck/2) + residu/2);
+ ww = (short)((ww/2) + residu/2);
if(residu == 2)
residu = 0;
}
else
{
residu = 0;
- fuck /= 2;
+ ww /= 2;
}
*/
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
{
- fuck /= 2;
+ ww /= 2;
} else
{
- fuck = (short) ((fuck / 2) + fuck % 2);
+ ww = (short) ((ww / 2) + ww % 2);
}
- buffer[i] = (byte) fuck;
+ buffer[i] = (byte) ww;
}
//System.out.print(bytes[i] + " ");
//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
@@ -7902,7 +8037,7 @@
String pigment = Object3D.GetPigment(tex);
String bump = Object3D.GetBump(tex);
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
{
// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
// System.out.println("; bump = " + bump);
@@ -7917,11 +8052,69 @@
pigment = null;
}
- ReleaseTexture(bump, true);
- ReleaseTexture(pigment, false);
+ ReleaseTexture(tex, true);
+ ReleaseTexture(tex, false);
}
- void ReleaseTexture(String tex, boolean bump)
+ 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(tex, 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(tex, true);
+ }
+
+ void ReleaseTexture(cTexture tex, boolean bump)
{
if (// DrawMode() != 0 || /*tex == null ||*/
ambientOcclusion ) // || !textureon)
@@ -7932,7 +8125,7 @@
CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
if (tex != null)
- texture = textures.get(tex);
+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
// //assert( texture != null );
// if (texture == null)
@@ -8026,6 +8219,54 @@
/*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
{
+// if (// DrawMode() != 0 || /*tex == null ||*/
+// ambientOcclusion ) // || !textureon)
+// {
+// return; // false;
+// }
+//
+// if (tex == null)
+// {
+// BindTexture(null,false,resolution);
+// BindTexture(null,true,resolution);
+// return;
+// }
+//
+// String pigment = Object3D.GetPigment(tex);
+// String bump = Object3D.GetBump(tex);
+//
+// usedtextures.add(pigment);
+// usedtextures.add(bump);
+//
+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+// {
+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
+// // System.out.println("; bump = " + bump);
+// }
+//
+// if (bump.equals(""))
+// {
+// bump = null;
+// }
+// if (pigment.equals(""))
+// {
+// pigment = null;
+// }
+//
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
+// BindTexture(pigment, false, resolution);
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
+// BindTexture(bump, true, resolution);
+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
+//
+// return; // true;
+
+ BindPigmentTexture(tex, resolution);
+ BindBumpTexture(tex, resolution);
+ }
+
+ /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
+ {
if (// DrawMode() != 0 || /*tex == null ||*/
ambientOcclusion ) // || !textureon)
{
@@ -8035,17 +8276,47 @@
if (tex == null)
{
BindTexture(null,false,resolution);
- BindTexture(null,true,resolution);
return;
}
String pigment = Object3D.GetPigment(tex);
+
+ usedtextures.add(tex);
+
+ //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(tex, 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(pigment, pigment);
- usedtextures.put(bump, bump);
+ usedtextures.add(tex);
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
{
// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
// System.out.println("; bump = " + bump);
@@ -8055,18 +8326,10 @@
{
bump = null;
}
- if (pigment.equals(""))
- {
- pigment = null;
- }
- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
- BindTexture(pigment, false, resolution);
GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
- BindTexture(bump, true, resolution);
+ BindTexture(tex, true, resolution);
GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
-
- return; // true;
}
java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
@@ -8089,13 +8352,19 @@
return fileExists;
}
- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
{
- CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
+ CacheTexture texturecache = null;
if (tex != null)
{
- String texname = tex;
+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
+
+ if (texname.equals("") && texdata == null)
+ {
+ return null;
+ }
String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
@@ -8105,19 +8374,46 @@
// else
// if (!texname.startsWith("/"))
// texname = "/Users/nbriere/Textures/" + texname;
- if (!FileExists(tex))
+ if (!FileExists(texname) && !texname.startsWith("@"))
{
texname = fallbackTextureName;
}
if (CACHETEXTURE)
- texture = textures.get(texname); // TEXTURE CACHE
-
- TextureData texturedata = null;
-
- if (texture == null || texture.resolution < resolution)
{
- if (tex.equals("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
+ if (texdata == null)
+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
+ else
+ texturecache = bimtextures.get(texdata);
+ }
+
+ if (texturecache == null || texturecache.resolution != -1 && texturecache.resolution < resolution)
+ {
+ TextureData texturedata = null;
+
+ if (texdata != null && textureon)
+ {
+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
+
+ try
+ {
+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
+ }
+ catch (Exception e)
+ {
+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
+ }
+
+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
+ bimtextures.put(texdata, texturecache);
+
+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
+
+ //Object bim2 = CreateBim(texturecache.texturedata);
+ //bim2 = bim;
+ }
+ else
+ if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
{
assert(!bump);
// if (bump)
@@ -8128,19 +8424,23 @@
// }
// else
// {
- texture = textures.get(tex);
- if (texture == null)
+ // texturecache = textures.get(texname); // suspicious
+ if (texturecache == null)
{
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
}
+ else
+ new Exception().printStackTrace();
// }
} else
- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
{
assert(bump);
- texture = textures.get(tex);
- if (texture == null)
- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
+ // texturecache = textures.get(texname); // suspicious
+ if (texturecache == null)
+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
+ else
+ new Exception().printStackTrace();
} else
{
//if (tex.equals("IMMORTAL"))
@@ -8148,11 +8448,22 @@
// texture = GetResourceTexture("default.png");
//} else
//{
- if (tex.equals("WHITE_NOISE"))
+ if (texname.endsWith("WHITE_NOISE"))
{
- texture = textures.get(tex);
- if (texture == null)
- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
+ // texturecache = textures.get(texname); // suspicious
+ if (texturecache == null)
+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
+ else
+ new Exception().printStackTrace();
+ } else
+ {
+ if (texname.startsWith("@") && textureon)
+ {
+ // texturecache = textures.get(texname); // suspicious
+ if (texturecache == null)
+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
+ else
+ new Exception().printStackTrace();
} else
{
if (textureon)
@@ -8211,19 +8522,20 @@
if (texturedata == null)
throw new Exception();
- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
+ texturecache = new CacheTexture(texturedata,resolution);
//texture = GetTexture(tex, bump);
}
+ }
}
//}
}
- if (/*CACHETEXTURE &&*/ texture != null && textureon)
+ if (texdata == null && /*CACHETEXTURE &&*/ texturecache != null && textureon)
{
//return false;
// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
- if (texturedata != null && (texname.endsWith(".jpg") || texname.endsWith(".JPG")))
+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
{
// String ext = "_highres";
// if (REDUCETEXTURE)
@@ -8240,52 +8552,17 @@
File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
if (!cachefile.exists())
{
- // cache to disk
- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
- //buffers[0].
-
- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
- int[] pixels = new int[bytebuf.capacity()/3];
-
- // squared size heuristic...
- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
+ //if (texturedata.getWidth() == texturedata.getHeight())
{
- for (int i=pixels.length; --i>=0;)
- {
- int i3 = i*3;
- pixels[i] = 0xFF;
- pixels[i] <<= 8;
- pixels[i] |= bytebuf.get(i3+2) & 0xFF;
- pixels[i] <<= 8;
- pixels[i] |= bytebuf.get(i3+1) & 0xFF;
- pixels[i] <<= 8;
- pixels[i] |= bytebuf.get(i3) & 0xFF;
- }
-
- /*
- int r=0,g=0,b=0,a=0;
- for (int i=0; i<width; i++)
- for (int j=0; j<height; j++)
- {
- int index = j*width+i;
- int p = pixels[index];
- a = ((p>>24) & 0xFF);
- r = ((p>>16) & 0xFF);
- g = ((p>>8) & 0xFF);
- b = (p & 0xFF);
- pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
- }
- /**/
- int width = (int)Math.sqrt(pixels.length); // squared
- int height = width;
- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
+ BufferedImage rendImage = CreateBim(texturedata);
+
ImageWriter writer = null;
Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
if (iter.hasNext()) {
writer = (ImageWriter)iter.next();
}
- float compressionQuality = 0.9f;
+
+ float compressionQuality = 0.85f;
try
{
ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
@@ -8302,18 +8579,20 @@
}
}
}
-
+
+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
+
//System.out.println("Texture = " + tex);
- if (textures.containsKey(texname))
+ if (textures.containsKey(tex))
{
- CacheTexture thetex = textures.get(texname);
+ CacheTexture thetex = textures.get(tex);
thetex.texture.disable();
thetex.texture.dispose();
- textures.remove(texname);
+ textures.remove(tex);
}
- texture.texturedata = texturedata;
- textures.put(texname, texture);
+ //texture.texturedata = texturedata;
+ textures.put(tex, texturecache);
// newtex = true;
}
@@ -8329,10 +8608,46 @@
}
}
- return texture;
+ return texturecache;
}
- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
+ static void EmbedTextures(cTexture tex)
+ {
+ if (tex.pigmentdata == null)
+ {
+ //String texname = Object3D.GetPigment(tex);
+
+ CacheTexture texturecache = texturepigment.get(tex);
+
+ if (texturecache != null)
+ {
+ tex.pw = texturecache.texturedata.getWidth();
+ tex.ph = texturecache.texturedata.getHeight();
+ tex.pigmentdata = //CompressJPEG(CreateBim
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
+ ;
+ //, tex.pw, tex.ph), 0.5f);
+ }
+ }
+
+ if (tex.bumpdata == null)
+ {
+ //String texname = Object3D.GetBump(tex);
+
+ CacheTexture texturecache = texturebump.get(tex);
+
+ if (texturecache != null)
+ {
+ tex.bw = texturecache.texturedata.getWidth();
+ tex.bh = texturecache.texturedata.getHeight();
+ tex.bumpdata = //CompressJPEG(CreateBim(
+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
+ //, tex.bw, tex.bh), 0.5f);
+ }
+ }
+ }
+
+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
{
CacheTexture texture = GetCacheTexture(tex, bump, resolution);
@@ -8350,21 +8665,21 @@
return texture!=null?texture.texture:null;
}
- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture 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) throws Exception
+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
{
if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
{
return false;
}
- boolean newtex = false;
+ //boolean newtex = false;
com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
@@ -8396,9 +8711,75 @@
texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
- return newtex;
+ return true; // Warning: not used.
}
+ public static byte[] CompressJPEG(BufferedImage image, float quality)
+ {
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
+ ImageWriter writer = writers.next();
+
+ ImageWriteParam param = writer.getDefaultWriteParam();
+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+ param.setCompressionQuality(quality);
+
+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
+ writer.setOutput(ios);
+ writer.write(null, new IIOImage(image, null, null), param);
+
+ byte[] data = baos.toByteArray();
+ writer.dispose();
+ return data;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
+ {
+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
+ ImageReader reader = writers.next();
+
+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+
+ ImageReadParam param = reader.getDefaultReadParam();
+ param.setDestination(bim);
+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
+
+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
+ reader.setInput(ios);
+ BufferedImage bim2 = reader.read(0, param);
+ reader.dispose();
+
+// WritableRaster raster = bim2.getRaster();
+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
+// byte[] bytes = data.getData();
+//
+// int[] pixels = new int[bytes.length/3];
+// for (int i=pixels.length; --i>=0;)
+// {
+// int i3 = i*3;
+// pixels[i] = 0xFF;
+// pixels[i] <<= 8;
+// pixels[i] |= bytes[i3+2] & 0xFF;
+// pixels[i] <<= 8;
+// pixels[i] |= bytes[i3+1] & 0xFF;
+// pixels[i] <<= 8;
+// pixels[i] |= bytes[i3] & 0xFF;
+// }
+//
+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
+
+ return bim;
+ }
+
ShadowBuffer shadowPBuf;
AntialiasBuffer antialiasPBuf;
int MAXSTACK;
@@ -8415,10 +8796,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)); //
@@ -8426,7 +8809,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 };
@@ -8591,7 +8975,7 @@
if (cubemap == null)
{
- LoadEnvy(5);
+ //LoadEnvy(1);
}
//cubemap.enable();
@@ -8867,6 +9251,8 @@
void LoadEnvy(int which)
{
+ assert(false);
+
String name;
String ext;
@@ -8878,37 +9264,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)
@@ -8940,8 +9347,12 @@
static double[] model = new double[16];
double[] camera2light = new double[16];
double[] light2camera = new double[16];
- int newenvy = -1;
- boolean envyoff = true; // false;
+
+ //int newenvy = -1;
+ //boolean envyoff = false;
+
+ 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);
@@ -9234,11 +9645,35 @@
jy8[3] = 0.5f;
}
- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
float[] options3 = new float[]{1, 1, 1, 0}; // fog color
float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
+ void ResetOptions()
+ {
+ options1[0] = 100;
+ options1[1] = 0.025f;
+ options1[2] = 0.01f;
+ options1[3] = 0;
+ options1[4] = 0;
+
+ options2[0] = 0;
+ options2[1] = 0.75f;
+ options2[2] = 0;
+ options2[3] = 0;
+
+ options3[0] = 1;
+ options3[1] = 1;
+ options3[2] = 1;
+ options3[3] = 0;
+
+ options4[0] = 1;
+ options4[1] = 0;
+ options4[2] = 1;
+ options4[3] = 0;
+ }
+
static int imagecount = 0; // movie generation
static int jitter = 0;
@@ -9397,13 +9832,18 @@
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,
+
+ boolean vr = capsLocked && !lightMode;
+
+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
ratio,
//near_plane, far_plane,
renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
@@ -10266,9 +10706,18 @@
static boolean init = false;
double[][] matrix = LA.newMatrix();
+
+ // This is to refresh the UI of the material panel.
+ ObjEditor patchMaterial;
public void display(GLAutoDrawable drawable)
{
+ if (patchMaterial.patchMaterial)
+ {
+ patchMaterial.patchMaterial = false;
+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
+ }
+
if (Grafreed.savesound && Grafreed.hassound)
{
Grafreed.wav.save();
@@ -10349,6 +10798,7 @@
ANTIALIAS = 0;
//System.out.println("RESTART");
AAtimer.restart();
+ Globals.TIMERRUNNING = true;
}
}
}
@@ -10363,6 +10813,112 @@
if (DrawMode() == DEFAULT)
{
+ if (manipCamera == lightCamera)
+ {
+// switch (e.getKeyCode())
+// {
+// case DOWN_ARROW:
+// lightCamera.DECAL /= 2;
+// repaint();
+// break;
+// case UP_ARROW:
+// lightCamera.DECAL *= 2;
+// repaint();
+// break;
+// case LEFT_ARROW:
+// lightCamera.SCALE /= 2;
+// repaint();
+// break;
+// case RIGHT_ARROW:
+// lightCamera.SCALE *= 2;
+// repaint();
+// break;
+// default:
+// break;
+ if (keys[DOWN_ARROW])
+ {
+ lightCamera.DECAL /= 2;
+ }
+
+ if (keys[UP_ARROW])
+ {
+ lightCamera.DECAL *= 2;
+ }
+
+ if (keys[LEFT_ARROW])
+ {
+ lightCamera.SCALE /= 2;
+ }
+
+ if (keys[RIGHT_ARROW])
+ {
+ lightCamera.SCALE *= 2;
+ }
+ }
+ else
+ {
+ //pingthread.mute = true;
+
+ boolean keyon = false;
+
+ if (keys[DOWN_ARROW])
+ {
+ speed = ++speedkey[DOWN_ARROW];
+ if (speed > 20)
+ speed = 20;
+ GoDown(modifiers);
+ keyon = true;
+ }
+ else
+ speedkey[DOWN_ARROW] = 0;
+
+ if (keys[UP_ARROW])
+ {
+ speed = ++speedkey[UP_ARROW];
+ if (speed > 20)
+ speed = 20;
+ GoUp(modifiers);
+ keyon = true;
+ }
+ else
+ speedkey[UP_ARROW] = 0;
+
+ if (keys[LEFT_ARROW])
+ {
+ speed = ++speedkey[LEFT_ARROW];
+ if (speed > 20)
+ speed = 20;
+ GoLeft(modifiers);
+ keyon = true;
+ }
+ else
+ speedkey[LEFT_ARROW] = 0;
+
+ if (keys[RIGHT_ARROW])
+ {
+ speed = ++speedkey[RIGHT_ARROW];
+ if (speed > 20)
+ speed = 20;
+ GoRight(modifiers);
+ keyon = true;
+ }
+ else
+ speedkey[RIGHT_ARROW] = 0;
+
+ if (Globals.WALK && capsLocked)
+ {
+ Walk();
+ keyon = true;
+ }
+
+ if (keyon)
+ {
+ repaint();
+ }
+
+ //pingthread.mute = false;
+ }
+
currentlydrawing = true;
}
@@ -10416,7 +10972,8 @@
ambientOcclusion = false;
}
- if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
+ if (//Globals.lighttouched &&
+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
{
//if (RENDERSHADOW) // ?
if (!IsFrozen())
@@ -10435,7 +10992,7 @@
if (wait)
{
- Sleep(500);
+ Sleep(200); // blocks everything
wait = false;
}
@@ -10651,13 +11208,43 @@
gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
}
- if (newenvy > -1)
+// if (newenvy > -1)
+// {
+// LoadEnvy(newenvy);
+// }
+//
+// newenvy = -1;
+
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
{
- LoadEnvy(newenvy);
+ if (cubemaprgb == null)
+ {
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
+ }
+
+ cubemap = cubemaprgb;
}
-
- newenvy = -1;
-
+ else
+ {
+ if (object.skyboxname != null)
+ {
+ if (!object.skyboxname.equals(this.loadedskyboxname))
+ {
+ if (cubemap != null && cubemap != cubemaprgb)
+ cubemap.dispose();
+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
+ loadedskyboxname = object.skyboxname;
+ }
+ }
+ else
+ {
+ cubemapcustom = null;
+ loadedskyboxname = null;
+ }
+
+ cubemap = cubemapcustom;
+ }
+
ratio = ((double) getWidth()) / getHeight();
//System.out.println("ratio = " + ratio);
@@ -10673,7 +11260,7 @@
if (!IsFrozen() && !ambientOcclusion)
{
- DrawSkyBox(gl);
+ DrawSkyBox(gl, (float)ratio);
}
//if (selection_view == -1)
@@ -10856,8 +11443,8 @@
gl.glMatrixMode(GL.GL_MODELVIEW);
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
//gl.glEnable(gl.GL_POLYGON_SMOOTH);
+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
//gl.glEnable(gl.GL_MULTISAMPLE);
} else
{
@@ -10869,7 +11456,7 @@
//System.out.println("BLENDING ON");
gl.glEnable(GL.GL_BLEND);
gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
-
+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
gl.glMatrixMode(gl.GL_PROJECTION);
gl.glLoadIdentity();
@@ -10919,7 +11506,10 @@
//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
} else
{
- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
+ boolean vr = capsLocked && !lightMode;
+
+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
}
}
@@ -10981,7 +11571,7 @@
{
if (cam != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformDir(light0, parentcam.GlobalTransformInv(), light0); // may 2013
+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
}
LA.xformPos(light0, cam.toScreen, light0);
@@ -11118,7 +11708,7 @@
}
}
- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
{
//gl.glDepthFunc(GL.GL_LEQUAL);
//gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
@@ -11126,24 +11716,21 @@
boolean texon = textureon;
- if (RENDERPROGRAM > 0)
- {
- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
- textureon = false;
- }
+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
+ textureon = false;
+
//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
//System.out.println("ALLO");
gl.glColorMask(false, false, false, false);
DrawObject(gl);
- if (RENDERPROGRAM > 0)
- {
- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
- textureon = texon;
- }
+
+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
+ textureon = texon;
+
gl.glColorMask(true, true, true, true);
gl.glDepthFunc(GL.GL_EQUAL);
- //gl.glDepthMask(false);
+ gl.glDepthMask(false);
}
if (false) // DrawMode() == SHADOW)
@@ -11278,8 +11865,11 @@
repaint();
}
- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
+ if (Globals.isLIVE() && DrawMode() == DEFAULT || pingthread.live) // may 2013
+ {
+ renderCamera.computeTransform();
repaint();
+ }
displaydone = true;
}
@@ -11326,16 +11916,51 @@
static boolean zoomonce = false;
+ static void CreateSelectedPoint()
+ {
+ if (selectedpoint == null)
+ {
+ debugpointG = new Sphere();
+ debugpointP = new Sphere();
+ debugpointC = new Sphere();
+ debugpointR = new Sphere();
+
+ selectedpoint = new Superellipsoid();
+
+ for (int i=0; i<8; i++)
+ {
+ debugpoints[i] = new Sphere();
+ }
+ }
+ }
+
void DrawObject(GL gl, boolean draw)
{
+ // To clear camera values
+ ResetOptions();
+
//System.out.println("DRAW OBJECT " + mouseDown);
// DrawMode() = SELECTION;
//GL gl = getGL();
if ((TRACK || SHADOWTRACK) || zoomonce)
{
+ if (TRACK)
+ {
+ if (object.selection != null &&
+ object.selection.size() > 0 &&
+ object.selection.elementAt(0) != null &&
+ !(object.selection.elementAt(0) instanceof Camera) &&
+ !(object.selection.elementAt(0) instanceof ScriptNode))
+ {
+ trackedobject = object.selection.elementAt(0);
+ //repaint();
+ }
+ else
+ trackedobject = null;
+ }
if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
- pingthread.StepToTarget(true); // true);
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
+ pingthread.StepToTarget(); // true);
// zoomonce = false;
}
@@ -11406,8 +12031,9 @@
if (DrawMode() == DEFAULT)
{
- if (DEBUG)
+ if (Globals.DEBUG)
{
+ CreateSelectedPoint();
float radius = 0.05f;
if (selectedpoint.radius != radius)
{
@@ -11461,20 +12087,32 @@
ReleaseTextures(DEFAULT_TEXTURES);
if (CLEANCACHE)
- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
{
- String tex = e.nextElement();
+ cTexture tex = e.nextElement();
// System.out.println("Texture --------- " + tex);
- if (tex.equals("WHITE_NOISE"))
+ if (tex.equals("WHITE_NOISE:"))
continue;
- if (!usedtextures.containsKey(tex))
+ if (!usedtextures.contains(tex))
{
+ CacheTexture gettex = texturepigment.get(tex);
// System.out.println("DISPOSE +++++++++++++++ " + tex);
- textures.get(tex).texture.dispose();
- textures.remove(tex);
+ if (gettex != null)
+ {
+ gettex.texture.dispose();
+ texturepigment.remove(tex);
+ }
+
+ gettex = texturebump.get(tex);
+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
+ if (gettex != null)
+ {
+ gettex.texture.dispose();
+ texturebump.remove(tex);
+ }
}
}
}
@@ -11912,7 +12550,7 @@
}
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.xformPos(light, parentcam.GlobalTransformInv(), light); // may 2013
+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
LA.xformPos(light, renderCamera.toScreen, light);
@@ -12002,8 +12640,82 @@
//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
- String program =
+ String programmin =
+ // Min shader
"!!ARBfp1.0\n" +
+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
+ "PARAM light2cam0 = program.env[10];" +
+ "PARAM light2cam1 = program.env[11];" +
+ "PARAM light2cam2 = program.env[12];" +
+ "TEMP temp;" +
+ "TEMP light;" +
+ "TEMP ndotl;" +
+ "TEMP normal;" +
+ "TEMP depth;" +
+ "TEMP eye;" +
+ "TEMP pos;" +
+
+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
+ Normalize("normal") +
+ "MOV light, state.light[0].position;" +
+ "DP3 ndotl.x, light, normal;" +
+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
+
+ // shadow
+ "MOV pos, fragment.texcoord[1];" +
+ "MOV temp, pos;" +
+ ShadowTextureFetch("depth", "temp", "1") +
+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
+
+ // No shadow when out of frustum
+ //"SGE temp.y, depth.z, zero123.y;" +
+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
+
+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
+
+ // Backlit
+ "MOV pos.w, zero12t.y;" + // one
+ "DP4 eye.x, pos, light2cam0;" +
+ "DP4 eye.y, pos, light2cam1;" +
+ "DP4 eye.z, pos, light2cam2;" +
+ Normalize("eye") +
+
+ "DP3 ndotl.y, -eye, normal;" +
+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
+ "ADD ndotl.y, ndotl.y, one.x;" +
+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
+
+ //"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;" +
+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
+ "MUL temp, temp, zero12t.w;" + // Times x
+
+ //"MUL temp, temp, ndotl.y;" +
+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
+
+ "MUL temp, temp, ndotl.x;" + // lambert
+
+ "MOV temp.w, zero12t.y;" + // reset alpha
+ "MOV result.color, temp;" +
+ "END";
+
+ String programmax =
+ "!!ARBfp1.0\n" +
+
//"OPTION ARB_fragment_program_shadow;" +
"PARAM light2cam0 = program.env[10];" +
"PARAM light2cam1 = program.env[11];" +
@@ -12029,7 +12741,7 @@
"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
- "PARAM params7 = program.env[7];" + // noise power, opacity power
+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
"PARAM options1 = program.env[62];" + // fog rgb color
"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
@@ -12118,8 +12830,7 @@
"TEMP shininess;" +
"\n" +
"MOV texSamp, one;" +
- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
-
+
"MOV mapgrid.x, one2048th.x;" +
"MOV temp, fragment.texcoord[1];" +
/*
@@ -12140,20 +12851,20 @@
"MUL temp, floor, mapgrid.x;" +
//"TEX depth0, temp, texture[1], 2D;" +
(((mode & FP_SOFTSHADOW) == 0) ? "" :
- TextureFetch("depth0", "temp", "1") +
+ ShadowTextureFetch("depth0", "temp", "1") +
"") +
"ADD temp.x, temp.x, mapgrid.x;" +
//"TEX depth1, temp, texture[1], 2D;" +
(((mode & FP_SOFTSHADOW) == 0) ? "" :
- TextureFetch("depth1", "temp", "1") +
+ ShadowTextureFetch("depth1", "temp", "1") +
"") +
"ADD temp.y, temp.y, mapgrid.x;" +
//"TEX depth2, temp, texture[1], 2D;" +
- TextureFetch("depth2", "temp", "1") +
+ ShadowTextureFetch("depth2", "temp", "1") +
"SUB temp.x, temp.x, mapgrid.x;" +
//"TEX depth3, temp, texture[1], 2D;" +
(((mode & FP_SOFTSHADOW) == 0) ? "" :
- TextureFetch("depth3", "temp", "1") +
+ ShadowTextureFetch("depth3", "temp", "1") +
"") +
//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
//"MOV params, material;" +
@@ -12275,7 +12986,7 @@
"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
// mar 2013 ??? "KIL alpha.a;" +
"MOV alpha, texSamp.aaaa;" + // y;" +
- "KIL alpha.a;" +
+ "KIL alpha.a;" + // not sure with parallax mapping
/*
"MUL temp.xy, temp, two;" +
"TXB bump, temp, texture[0], 2D;" +
@@ -12361,11 +13072,6 @@
"SUB bump0, bump0, half;" +
"ADD bump, bump, bump0;" +
- "MOV temp.x, texSamp.a;" +
- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
- //"LRP texSamp0, params5.x, texSamp0, one;" +
- "MOV texSamp.a, temp.x;" +
-
// double-sided
/**/
(doublesided?"DP3 temp.z, normal, eye;" +
@@ -12375,26 +13081,73 @@
"ADD temp.x, temp.x, one.x;" +
"MUL normal, normal, temp.xxxx;":""
) +
- /**/
-//// Normalize("normal") +
-//// "MAX normal.z, eps.x, normal.z;" +
-// Normalize("normal") +
- "MOV normald, normal;" +
- "MOV normals, normal;" +
+ /**/
+
+ "MOV temp, fragment.texcoord[4];" +
// UV base
//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
+ Normalize("UP") +
+
"XPD V, normal, UP;" +
Normalize("V") +
"XPD U, V, normal;" +
Normalize("U") +
+ "MOV temp, fragment.texcoord[0];" +
+
+// "MAD normal, -temp.x, U, normal;" +
+// "MAD normal, -temp.y, V, normal;" +
+// Normalize("normal") +
+
+//// "MAX normal.z, eps.x, normal.z;" +
+// Normalize("normal") +
+ "MOV normald, normal;" +
+ "MOV normals, normal;" +
+
// parallax mapping
+
+ "DP3 temp2.x, V, eye;" +
+ "DP3 temp2.y, U, eye;" +
+ "DP3 temp2.z, normal, eye;" +
+ "RCP temp2.z, temp2.z;" +
+
+ "DP3 temp2.w, texSamp, texSamp;" + // Height
+ "RSQ temp2.w, temp2.w;" +
+ "RCP temp2.w, temp2.w;" +
+
+ "SUB temp2.w, temp2.w, half;" +
+ // "SGE temp.x, temp2.w, eps.x;" +
+ // "MUL temp2.w, temp2.w, temp.x;" +
+
+ // "MOV texSamp, U;" +
+
+ "MUL temp2.z, temp2.z, temp2.w;" +
+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
+
+ "MUL temp2, temp2, temp2.z;" +
+
+ "SUB temp, temp, temp2;" +
+
+ "TEX temp, temp, texture[0], 2D;" +
+ "POW temp.a, temp.a, params6.w;" + // punch through
+
+ "ADD texSamp, temp, texSamp;" +
+ "MUL texSamp.xyz, half, texSamp;" +
+
+ "MOV alpha, texSamp.aaaa;" +
+
+// parallax mapping
+
+ "MOV temp.x, texSamp.a;" +
+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
+ //"LRP texSamp0, params5.x, texSamp0, one;" +
+ "MOV texSamp.a, temp.x;" +
//"MOV temp, fragment.texcoord[0];" +
//
@@ -12524,10 +13277,10 @@
"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
"") +
- // display shadow only (bump == 0)
+ // display shadow only (fakedepth == 0)
"SUB temp.x, half.x, shadow.x;" +
"MOV temp.y, -params5.z;" + // params6.x;" +
- "SLT temp.z, temp.y, -one2048th.x;" +
+ "SLT temp.z, temp.y, -c256i.x;" +
"SUB temp.y, one.x, temp.z;" +
"MUL temp.x, temp.x, temp.y;" +
"KIL temp.x;" +
@@ -12858,8 +13611,19 @@
//once = true;
}
- 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 " : ""));
+ String program = programmax;
+
+ if (Globals.MINSHADER)
+ {
+ program = programmin;
+ }
+
+ if (Globals.DEBUG)
+ {
+ 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);
//gl.glNewList(displayListID, GL.GL_COMPILE);
@@ -12906,7 +13670,8 @@
"\n" +
"END\n";
- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
+ if (Globals.DEBUG)
+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
//gl.glNewList(displayListID, GL.GL_COMPILE);
@@ -12951,25 +13716,26 @@
return out;
}
- String TextureFetch(String dest, String src, String unit)
+ // Also does frustum culling
+ String ShadowTextureFetch(String dest, String src, String unit)
{
return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
"SGE " + src + ".w, " + src + ".x, eps.x;" +
"SGE " + src + ".z, " + src + ".y, eps.x;" +
+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
- "SLT " + src + ".z, " + src + ".x, one.x;" +
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
- "SLT " + src + ".z, " + src + ".y, one.x;" +
- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
//"SWZ buffer, temp, w,w,w,w;";
- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
}
String Shadow(String depth, String shadow)
@@ -13016,7 +13782,7 @@
"SLT temp.x, temp.x, zero.x;" + // shadoweps
"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
- // No shadow when out of frustrum
+ // No shadow when out of frustum
"SGE temp.x, " + depth + ".z, one.z;" +
"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
"";
@@ -13163,8 +13929,9 @@
/*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
/*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
/*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
- /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
- Object3D.cVector2[] vector2buffer;
+ /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
+
+ //Object3D.cVector2[] vector2buffer;
// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
// OUT : diff, spec
@@ -13180,9 +13947,10 @@
"DP3 " + dest + ".z," + "normals," + "eye;" +
"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
//"MOV " + dest + ".w," + "normal.z;" +
- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
- //"MOV " + dest + ".z," + "params2.w;" +
+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
+
+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
"RCP " + dest + ".w," + dest + ".w;" +
//"RSQ " + dest + ".w," + dest + ".w;" +
@@ -13328,7 +14096,7 @@
"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
@@ -13389,7 +14157,7 @@
"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
- //"MOV result.texcoord, vertex.texcoord;" +
+ //"MOV result.texcoord, vertex.fogcoord;" +
"MOV result.texcoord, temp;" +
// border fade
"MOV result.texcoord[3], vertex.texcoord;" +
@@ -13436,7 +14204,9 @@
//"ADD temp.z, temp.z, one;" +
- "MOV result.color, temp;"
+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
+
+ "MOV result.color, temp;" // Normal
: "MOV result.color, vertex.color;") +
((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
: "") +
@@ -13571,10 +14341,13 @@
public void mouseClicked(MouseEvent e)
{
System.out.println("mouseClicked: " + e);
+ System.exit(0);
}
public void mousePressed(MouseEvent e)
{
+ RigidBody.justclicked = true;
+ System.out.println("justclicked: " + e);
//System.out.println("mousePressed: " + e);
clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
}
@@ -13609,10 +14382,12 @@
return;
}
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
+
+ boolean vr = capsLocked && !lightMode;
// TIMER
- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
{
keepboxmode = BOXMODE;
keepsupport = SUPPORT;
@@ -13653,7 +14428,7 @@
//}
SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
anchorX = ax;
anchorY = ay;
prevX = px;
@@ -13687,6 +14462,7 @@
else
if (evt.getSource() == AAtimer)
{
+ Globals.TIMERRUNNING = false;
if (mouseDown)
{
//new Exception().printStackTrace();
@@ -13746,9 +14522,10 @@
// fev 2014???
if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
- pingthread.StepToTarget(true); // true);
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
+ pingthread.StepToTarget(); // true);
}
+
// if (!LIVE)
super.repaint();
}
@@ -13761,6 +14538,7 @@
return;
AAtimer.restart(); //
+ Globals.TIMERRUNNING = true;
// waslive = LIVE;
// LIVE = false;
@@ -13810,14 +14588,15 @@
drag = false;
//System.out.println("Mouse DOWN");
editObj = false;
- ClickInfo info = new ClickInfo();
- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
- info.pane = this;
- info.camera = renderCamera;
- info.x = x;
- info.y = y;
- info.modifiers = modifiersex;
- editObj = object.doEditClick(info, 0);
+ //ClickInfo info = new ClickInfo();
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
+ object.clickInfo.pane = this;
+ object.clickInfo.camera = renderCamera;
+ object.clickInfo.x = x;
+ object.clickInfo.y = y;
+ object.clickInfo.modifiers = modifiersex;
+ editObj = object.doEditClick(//info,
+ 0);
if (!editObj)
{
hasMarquee = true;
@@ -13833,14 +14612,16 @@
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
- || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
+ if ((e.getModifiersEx() & CTRL) != 0 ||
+ (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
{
//System.out.println("mouseDragged: " + e);
clickEnd(e.getX(), e.getY(), e.getModifiersEx());
@@ -13864,9 +14645,17 @@
return targetLookAt;
}
+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
+
+
class PingThread extends Thread
{
boolean jump;
+ boolean live;
+
+ boolean mute;
// void JumpToTarget()
// {
@@ -13882,6 +14671,88 @@
// only one thread!? synchronized
void StepToTarget(boolean jump)
{
+ RigidBody.pos.x = 0;
+ RigidBody.pos.y = 0;
+ RigidBody.pos.z = 0;
+ if (RigidBody.justclicked)
+ {
+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
+ RigidBody.wind.set(RigidBody.pos);
+ RigidBody.wind.x -= (float)manipCamera.location.x;
+ RigidBody.wind.y -= (float)manipCamera.location.y;
+ RigidBody.wind.z -= (float)manipCamera.location.z;
+ RigidBody.wind.normalize();
+ }
+
+ if (mute)
+ return;
+
+ if (capsLocked && manipCamera.viewCode == 0)
+ {
+ eye.x = manipCamera.location.x;
+ eye.y = manipCamera.location.y + 0.25;
+ eye.z = manipCamera.location.z;
+
+ dir.y = -1;
+
+ Ray ray = new Ray(eye, dir);
+
+ IntersectResult res = new IntersectResult();
+ res.t = Double.POSITIVE_INFINITY;
+
+ tmp.set(targetLookAt);
+ tmp.sub(manipCamera.location);
+
+ double dist = tmp.length();
+
+ tmp.normalize();
+
+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
+ eye2.y = manipCamera.location.y + 0.25;
+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
+
+ Ray ray2 = new Ray(eye2, dir);
+
+ IntersectResult res2 = new IntersectResult();
+ res2.t = Double.POSITIVE_INFINITY;
+
+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
+ {
+ //tmp.set(manipCamera.location);
+
+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
+
+ //tmp.sub(manipCamera.location);
+
+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
+
+ targetLookAt.sub(manipCamera.location);
+ targetLookAt.normalize();
+ targetLookAt.mul(dist);
+ targetLookAt.add(manipCamera.location);
+
+ //if (tmp.dot(tmp) > 0.000001)
+ // System.out.println("INTERSECTION " + manipCamera.location);
+
+ manipCamera.lookAt.set(targetLookAt);
+
+ tmp.x = res.n.x;
+ tmp.y = res.n.y;
+ tmp.z = res.n.z;
+ tmp.x += res2.n.x;
+ tmp.y += res2.n.y;
+ tmp.z += res2.n.z;
+ tmp.normalize();
+ manipCamera.UP.set(tmp);
+ }
+ }
+
tmp.set(targetLookAt);
tmp.sub(manipCamera.lookAt); // june 2014
@@ -13919,7 +14790,7 @@
if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
{
- jump = true; // step = 1;
+ // sep 2019 jump = true; // step = 1;
}
if (OEILONCE && OEIL)
@@ -13954,7 +14825,10 @@
if (tmp.dot(tmp) < 0.00001)
{
zoomonce = false;
+ live = false;
}
+ else
+ live = true;
tmp.mul(step > step2 ? step : step2);
}
@@ -13981,7 +14855,7 @@
{
if (LOOKAT)
manipCamera.lookAt.add(tmp);
- if (OEIL)
+ if (OEIL && !capsLocked)
manipCamera.location.add(tmp);
{
@@ -13996,7 +14870,10 @@
lightCamera.computeTransform();
}
}
- manipCamera.computeTransform();
+ if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
+ {
+ manipCamera.computeTransform();
+ }
}
// ?????? mouseDown = true;
//System.out.println("---------------- ---------- Paint " + tmp.length2());
@@ -14089,49 +14966,107 @@
}
}
}
+
PingThread pingthread = new PingThread();
- int delta = 5;
- int speed = 5;
+ int delta = 1;
+ int speed = 1;
+ int walk = 8;
boolean autorepeat = false;
+ void Walk()
+ {
+ manipCamera.BackForth(0, walk, 1000);
+
+ targetLookAt.set(manipCamera.lookAt);
+ }
+
+ void ViewAngle(float dy)
+ {
+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
+
+ if (manipCamera.shaper_fovy * factor > 1 &&
+ manipCamera.shaper_fovy * factor < 150)
+ {
+ manipCamera.shaper_fovy *= factor;
+ //System.out.println("fovy = " + shaper_fovy);
+ }
+ }
+
void GoDown(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ boolean isVR = (mouseMode&VR)!=0;
+ /**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(0, -speed);
- else
- manipCamera.BackForth(0, -speed*delta, getWidth());
- */
- if ((mod & SHIFT) == SHIFT)
{
- mouseMode = mouseMode; // VR??
- } else
- {
- mouseMode |= BACKFORTH;
+// if (isVR)
+// manipCamera.RotateInterest(0, speed);
+// else
+ if (isVR)
+ ViewAngle(-speed*delta);
+ else
+ manipCamera.Translate(0, -speed*delta, getWidth());
}
+ else
+ {
+ if (isVR)
+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
+ else
+ manipCamera.RotatePosition(0, -speed);
+ }
+
+ /**/
+// if ((mod & SHIFT) == SHIFT)
+// {
+// mouseMode = mouseMode; // VR??
+// } else
+// {
+// mouseMode |= BACKFORTH;
+// }
+ targetLookAt.set(manipCamera.lookAt);
+
//prevX = X = anchorX;
prevY = Y = anchorY - (int) (renderCamera.Distance());
}
void GoUp(int mod)
{
+ RigidBody.justclicked = true;
+
MODIFIERS |= COMMAND;
- /*
+ /**/
+ boolean isVR = (mouseMode&VR)!=0;
+
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(0, speed);
- else
- manipCamera.BackForth(0, speed*delta, getWidth());
- */
- if ((mod & SHIFT) == SHIFT)
{
- mouseMode = mouseMode;
- } else
- {
- mouseMode |= BACKFORTH;
+// if (isVR)
+// manipCamera.RotateInterest(0, -speed);
+// else
+ if (isVR)
+ ViewAngle(speed*delta);
+ else
+ manipCamera.Translate(0, speed*delta, getWidth());
}
+ else
+ {
+ if (isVR)
+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
+ else
+ manipCamera.RotatePosition(0, speed);
+ }
+
+ /**/
+// if ((mod & SHIFT) == SHIFT)
+// {
+// mouseMode = mouseMode;
+// } else
+// {
+// mouseMode |= BACKFORTH;
+// }
+ targetLookAt.set(manipCamera.lookAt);
+
//prevX = X = anchorX;
prevY = Y = anchorY + (int) (renderCamera.Distance());
}
@@ -14139,20 +15074,31 @@
void GoLeft(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(speed, 0);
+ manipCamera.Translate(speed, 0, getWidth());
else
- manipCamera.Translate(speed*delta, 0, getWidth());
- */
- if ((mod & SHIFT) == SHIFT)
{
- mouseMode = mouseMode;
- } else
- {
- mouseMode |= ROTATE;
- } // TRANSLATE;
+ if ((mouseMode&VR)!=0)
+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
+ else
+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
+ }
+
+ /**/
+// if ((mod & SHIFT) == SHIFT)
+// {
+// mouseMode = mouseMode;
+// } else
+// {
+// mouseMode |= ROTATE;
+// } // TRANSLATE;
+ //System.err.println("lookAt = " + manipCamera.lookAt);
+ //System.err.println("location = " + manipCamera.location);
+
+ targetLookAt.set(manipCamera.lookAt);
+
prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
prevY = Y = anchorY;
}
@@ -14160,20 +15106,28 @@
void GoRight(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(-speed, 0);
+ manipCamera.Translate(-speed, 0, getWidth());
else
- manipCamera.Translate(-speed*delta, 0, getWidth());
- */
- if ((mod & SHIFT) == SHIFT)
{
- mouseMode = mouseMode;
- } else
- {
- mouseMode |= ROTATE;
- } // TRANSLATE;
+ if ((mouseMode&VR)!=0)
+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
+ else
+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
+ }
+
+ /**/
+// if ((mod & SHIFT) == SHIFT)
+// {
+// mouseMode = mouseMode;
+// } else
+// {
+// mouseMode |= ROTATE;
+// } // TRANSLATE;
+ targetLookAt.set(manipCamera.lookAt);
+
prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
prevY = Y = anchorY;
}
@@ -14215,14 +15169,16 @@
if (editObj)
{
drag = true;
- ClickInfo info = new ClickInfo();
- info.bounds.setBounds(0, 0,
+ //ClickInfo info = new ClickInfo();
+ object.clickInfo.bounds.setBounds(0, 0,
(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
- info.pane = this;
- info.camera = renderCamera;
- info.x = x;
- info.y = y;
- object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
+ object.clickInfo.pane = this;
+ object.clickInfo.camera = renderCamera;
+ object.clickInfo.x = x;
+ object.clickInfo.y = y;
+ object //.GetWindow().copy
+ .doEditDrag(//info,
+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
} else
{
if (x < startX)
@@ -14305,6 +15261,11 @@
if ((mouseMode & ZOOM) != 0)
{
//if ((mouseMode & BACKFORTH) != 0)
+ if ((modifiersex & SHIFT) == SHIFT)
+ {
+ ViewAngle(dy);
+ }
+ else
if ((mouseMode & VR) != 0)
manipCamera.BackForth(dx, dy, getWidth());
else
@@ -14371,22 +15332,30 @@
}
}
+// ClickInfo clickInfo = new ClickInfo();
+
public void mouseMoved(MouseEvent e)
{
+//object.editWindow.frame.
+ setCursor(Cursor.getDefaultCursor());
+
//System.out.println("mouseMoved: " + e);
if (isRenderer)
return;
- ClickInfo ci = new ClickInfo();
- ci.x = e.getX();
- ci.y = e.getY();
- ci.modifiers = e.getModifiersEx();
- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
- ci.pane = this;
- ci.camera = renderCamera;
+ // Mouse cursor feedback
+ object.clickInfo.x = e.getX();
+ object.clickInfo.y = e.getY();
+ object.clickInfo.modifiers = e.getModifiersEx();
+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
+ object.clickInfo.pane = this;
+ object.clickInfo.camera = renderCamera;
if (!isRenderer)
{
- if (object.editWindow.copy.doEditClick(ci, 0))
+ //ObjEditor editWindow = object.editWindow;
+ //Object3D copy = editWindow.copy;
+ if (object.doEditClick(//clickInfo,
+ 0))
{
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else
@@ -14398,8 +15367,11 @@
public void mouseReleased(MouseEvent e)
{
+ Globals.MOUSEDRAGGED = false;
+
movingcamera = false;
- X = Y = 0;
+ X = 0; // getBounds().width/2;
+ Y = 0; // getBounds().height/2;
//System.out.println("mouseReleased: " + e);
clickEnd(e.getX(), e.getY(), e.getModifiersEx());
}
@@ -14551,8 +15523,10 @@
mouseMode |= ZOOM;
}
- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
- if (capsLocked) // || (modifiers & META) == META)
+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
+ boolean vr = capsLocked && !lightMode;
+
+ if (vr) // || (modifiers & META) == META)
{
mouseMode |= VR; // BACKFORTH;
}
@@ -14564,7 +15538,8 @@
{
mouseMode |= SELECT;
}
- if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
+ if (//(modifiersex & SHIFT) == SHIFT ||
+ forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
{
mouseMode &= ~VR;
mouseMode |= TRANSLATE;
@@ -14608,8 +15583,18 @@
float SATPOW = 1; // 2; // 0.5f;
float BRIPOW = 1; // 0.5f; // 0.5f;
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+
+// Create a new blank cursor.
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
+ cursorImg, new Point(0, 0), "blank cursor");
+
public void keyPressed(int key)
{
+// Set the blank cursor to the JFrame.
+//object.editWindow.frame.
+ setCursor(blankCursor);
+
if (key >= '0' && key <= '5')
clampbit = (key-'0');
@@ -14655,7 +15640,8 @@
// break;
case 'T':
CACHETEXTURE ^= true;
- textures.clear();
+ texturepigment.clear();
+ texturebump.clear();
// repaint();
break;
case 'Y':
@@ -14665,8 +15651,8 @@
case 'K':
KOMPACTTEXTURE ^= true;
//textures.clear();
- break;
- case 'P': // Texture Projection macros
+ // break;
+ //case 'P': // Texture Projection macros
// SAVETEXTURE ^= true;
macromode = true;
Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
@@ -14740,7 +15726,9 @@
case 'E' : COMPACT ^= true;
repaint();
break;
- case 'W' : DEBUGHSB ^= true;
+ case 'W' : // Wide Window (fullscreen)
+ //DEBUGHSB ^= true;
+ ObjEditor.theFrame.ToggleFullScreen();
repaint();
break;
case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
@@ -14765,8 +15753,8 @@
RevertCamera();
repaint();
break;
+ //case 'l':
case 'L':
- case 'l':
if (lightMode)
{
lightMode = false;
@@ -14785,7 +15773,7 @@
targetLookAt.set(manipCamera.lookAt);
repaint();
break;
- case 'p':
+ case 'P': // p':
// c'est quoi ca au juste? spherical ^= true;
Skinshader ^= true; programInitialized = false;
repaint();
@@ -14796,7 +15784,8 @@
break;
case 'm':
{
- PrintMemory();
+ //PrintMemory();
+ ToggleImageFlip();
break;
}
case 'M':
@@ -14823,27 +15812,31 @@
repaint();
break;
case 'O':
- Globals.drawMode = OCCLUSION; // WARNING
- repaint();
- break;
+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
+ //repaint();
+ //break;
case 'o':
OCCLUSION_CULLING ^= true;
System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
break;
- case '0': envyoff ^= true; repaint(); break;
+ //case '0': envyoff ^= true; repaint(); break;
case '1':
case '2':
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 (true) // envyoff)
+ {
+ BGcolor = (key - '1')/8.f;
+ }
+ else
+ {
+ //newenvy = Character.getNumericValue(key);
+ }
repaint();
break;
case '!':
@@ -14909,11 +15902,25 @@
case '_':
kompactbit = 5;
break;
- case '+':
- kompactbit = 6;
- break;
+// case '+':
+// kompactbit = 6;
+// break;
case ' ':
+ capsLocked ^= true;
+ repaint();
+ break;
+ case 'l':
lightMode ^= true;
+ if (lightMode)
+ {
+ keepshadow = Globals.RENDERSHADOW;
+ Globals.RENDERSHADOW = false;
+ }
+ else
+ {
+ Globals.RENDERSHADOW = keepshadow;
+ }
+
Globals.lighttouched = true;
manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
targetLookAt.set(manipCamera.lookAt);
@@ -14921,8 +15928,13 @@
break;
//case '`' :
case ESC:
+ if (FULLSCREEN)
+ object.editWindow.ToggleFullScreen();
+ break;
+ case 'p':
RENDERPROGRAM += 1;
RENDERPROGRAM %= 3;
+
repaint();
break;
case 'Z':
@@ -14958,12 +15970,17 @@
case ENTER:
// object.editWindow.ScreenFit(); // Edit();
ToggleLive();
+ if (capsLocked)
+ {
+ Globals.WALK ^= true;
+ }
break;
case DELETE:
ClearSelection();
break;
- /*
case '+':
+
+ /*
//fontsize += 1;
bbzoom *= 2;
repaint();
@@ -14980,30 +15997,36 @@
case '=':
IncDepth();
//fontsize += 1;
- object.editWindow.refreshContents(true);
+ object.GetWindow().refreshContents(true);
maskbit = 6;
break;
case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
DecDepth();
maskbit = 5;
//if(fontsize > 1) fontsize -= 1;
- if (object.editWindow == null)
- new Exception().printStackTrace();
- else
- object.editWindow.refreshContents(true);
+// if (object.editWindow == null)
+// new Exception().printStackTrace();
+// else
+ object.GetWindow().refreshContents(true);
break;
case '{':
- manipCamera.shaper_fovy /= 1.1;
+ double factor = 1.1;
+ if (manipCamera.shaper_fovy / factor > 0.1)
+ manipCamera.shaper_fovy /= factor;
System.out.println("FOV = " + manipCamera.shaper_fovy);
repaint();
break;
case '}':
- manipCamera.shaper_fovy *= 1.1;
+ factor = 1.1;
+ if (manipCamera.shaper_fovy * factor < 150)
+ manipCamera.shaper_fovy *= factor;
System.out.println("FOV = " + manipCamera.shaper_fovy);
repaint();
break;
case '[':
- manipCamera.shaper_fovy /= 1.01;
+ factor = 1.01;
+ if (manipCamera.shaper_fovy / factor > 0.1)
+ manipCamera.shaper_fovy /= factor;
if (false) //manipCamera.hAspect == 0)
{
double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
@@ -15019,7 +16042,9 @@
break;
case ']':
//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
- manipCamera.shaper_fovy *= 1.01;
+ factor = 1.01;
+ if (manipCamera.shaper_fovy * factor < 150)
+ manipCamera.shaper_fovy *= factor;
if (false) //manipCamera.hAspect == 0)
{
double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
@@ -15057,98 +16082,113 @@
}
}
+ boolean keys[] = new boolean[256];
+ int speedkey[] = new int[256];
+ int modifiers = 0;
+
public void processKeyEvent(KeyEvent e)
{
switch (e.getID())
{
case KeyEvent.KEY_PRESSED:
- if (!autorepeat)
- {
- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
- keyPressed(e.getKeyChar(), e.getModifiersEx());
- }
- if (manipCamera == lightCamera)
- {
- switch (e.getKeyCode())
- {
- case DOWN_ARROW:
- lightCamera.DECAL /= 2;
- repaint();
- break;
- case UP_ARROW:
- lightCamera.DECAL *= 2;
- repaint();
- break;
- case LEFT_ARROW:
- lightCamera.SCALE /= 2;
- repaint();
- break;
- case RIGHT_ARROW:
- lightCamera.SCALE *= 2;
- repaint();
- break;
- default:
- break;
- }
-
- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
- } else
- {
- if (true) // !autorepeat)
- {
- boolean reset = true;
-
- switch (e.getKeyCode())
- {
- case DOWN_ARROW:
- GoDown(e.getModifiersEx());
- repaint();
- break;
- case UP_ARROW:
- GoUp(e.getModifiersEx());
- repaint();
- break;
- case LEFT_ARROW:
- GoLeft(e.getModifiersEx());
- repaint();
- break;
- case RIGHT_ARROW:
- GoRight(e.getModifiersEx());
- repaint();
- break;
- default:
- reset = false;
- break;
- }
-
- if (reset)
- {
- autorepeat = true;
-
- targetLookAt.set(manipCamera.lookAt);
- }
- }
- }
+ keys[e.getKeyCode()] = true;
+ modifiers = e.getModifiersEx();
+ keyPressed(e.getKeyChar(), modifiers);
+ //Globals.theRenderer.keyPressed(e.getKeyChar());
+ repaint();
break;
- case KeyEvent.KEY_TYPED:
- break;
+// if (!autorepeat)
+// {
+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
+// keyPressed(e.getKeyChar(), e.getModifiersEx());
+// }
+// if (manipCamera == lightCamera)
+// {
+// switch (e.getKeyCode())
+// {
+// case DOWN_ARROW:
+// lightCamera.DECAL /= 2;
+// repaint();
+// break;
+// case UP_ARROW:
+// lightCamera.DECAL *= 2;
+// repaint();
+// break;
+// case LEFT_ARROW:
+// lightCamera.SCALE /= 2;
+// repaint();
+// break;
+// case RIGHT_ARROW:
+// lightCamera.SCALE *= 2;
+// repaint();
+// break;
+// default:
+// break;
+// }
+//
+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
+// } else
+// {
+// if (true) // !autorepeat)
+// {
+// boolean reset = true;
+//
+// switch (e.getKeyCode())
+// {
+// case DOWN_ARROW:
+// GoDown(e.getModifiersEx());
+// repaint();
+// break;
+// case UP_ARROW:
+// GoUp(e.getModifiersEx());
+// repaint();
+// break;
+// case LEFT_ARROW:
+// GoLeft(e.getModifiersEx());
+// repaint();
+// break;
+// case RIGHT_ARROW:
+// GoRight(e.getModifiersEx());
+// repaint();
+// break;
+// default:
+// reset = false;
+// break;
+// }
+//
+// if (reset)
+// {
+// autorepeat = true;
+//
+// targetLookAt.set(manipCamera.lookAt);
+// }
+// }
+// }
+// break;
+// case KeyEvent.KEY_TYPED:
+// break;
case KeyEvent.KEY_RELEASED:
- {
- switch (e.getKeyCode())
- {
- case DOWN_ARROW:
- case UP_ARROW:
- case LEFT_ARROW:
- case RIGHT_ARROW:
- MODIFIERS &= ~COMMAND;
- autorepeat = false;
- break;
- default:
- break;
- }
+ keys[e.getKeyCode()] = false;
+ modifiers = e.getModifiersEx();
keyReleased(e.getKeyChar(), e.getModifiersEx());
+ repaint();
break;
- }
+// {
+// switch (e.getKeyCode())
+// {
+// case DOWN_ARROW:
+// case UP_ARROW:
+// case LEFT_ARROW:
+// case RIGHT_ARROW:
+// MODIFIERS &= ~COMMAND;
+// autorepeat = false;
+// break;
+// default:
+// break;
+// }
+// keyReleased(e.getKeyChar(), e.getModifiersEx());
+// break;
+// }
default:
break;
}
@@ -15214,7 +16254,7 @@
}
*/
- object.editWindow.EditSelection();
+ object.GetWindow().EditSelection(false);
}
void SelectParent()
@@ -15231,10 +16271,10 @@
{
//selectees.remove(i);
System.out.println("select parent of " + elem);
- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
} else
{
- group.editWindow.Select(elem.GetTreePath(), first, true);
+ group.GetWindow().Select(elem.GetTreePath(), first, true);
}
first = false;
@@ -15276,12 +16316,12 @@
for (int j = 0; j < group.children.size(); j++)
{
elem = (Object3D) group.children.elementAt(j);
- object.editWindow.Select(elem.GetTreePath(), first, true);
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
first = false;
}
} else
{
- object.editWindow.Select(elem.GetTreePath(), first, true);
+ object.GetWindow().Select(elem.GetTreePath(), first, true);
}
first = false;
@@ -15292,21 +16332,21 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.loadClipboard(true); // ClearSelection(false);
+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
}
void ResetTransform(int mask)
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.ResetTransform(mask);
+ group.GetWindow().ResetTransform(mask);
}
void FlipTransform()
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.FlipTransform();
+ group.GetWindow().FlipTransform();
// group.editWindow.ReduceMesh(true);
}
@@ -15314,7 +16354,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.PrintMemory();
+ group.GetWindow().PrintMemory();
// group.editWindow.ReduceMesh(true);
}
@@ -15322,7 +16362,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.ResetCentroid();
+ group.GetWindow().ResetCentroid();
}
void IncDepth()
@@ -15404,8 +16444,6 @@
int width = getBounds().width;
int height = getBounds().height;
- ClickInfo info = new ClickInfo();
- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
//Image img = CreateImage(width, height);
//System.out.println("width = " + width + "; height = " + height + "\n");
@@ -15482,43 +16520,77 @@
}
if (object != null && !hasMarquee)
{
+ if (object.clickInfo == null)
+ object.clickInfo = new ClickInfo();
+ ClickInfo info = object.clickInfo;
+ //ClickInfo info = new ClickInfo();
+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
+
if (isRenderer)
{
- info.flags++;
+ object.clickInfo.flags++;
double frameAspect = (double) width / (double) height;
if (frameAspect > renderCamera.aspect)
{
int desired = (int) ((double) height * renderCamera.aspect);
- info.bounds.width -= width - desired;
- info.bounds.x += (width - desired) / 2;
+ object.clickInfo.bounds.width -= width - desired;
+ object.clickInfo.bounds.x += (width - desired) / 2;
} else
{
int desired = (int) ((double) width / renderCamera.aspect);
- info.bounds.height -= height - desired;
- info.bounds.y += (height - desired) / 2;
+ object.clickInfo.bounds.height -= height - desired;
+ object.clickInfo.bounds.y += (height - desired) / 2;
}
}
- info.g = gr;
- info.camera = renderCamera;
+
+ object.clickInfo.g = gr;
+ object.clickInfo.camera = renderCamera;
/*
// Memory intensive (brep.verticescopy)
if (!(object instanceof Composite))
object.draw(info, 0, false); // SLOW :
*/
- if (!isRenderer)
+ if (!isRenderer) // && drag)
{
- object.drawEditHandles(info, 0);
-
- if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
+ Grafreed.Assert(object != null);
+ Grafreed.Assert(object.selection != null);
+ if (object.selection.Size() > 0)
{
- switch (object.selection.get(0).hitSomething)
+ int hitSomething = object.selection.get(0).hitSomething;
+
+ object.clickInfo.DX = 0;
+ object.clickInfo.DY = 0;
+ object.clickInfo.W = 1;
+ if (hitSomething == Object3D.hitCenter)
{
- case Object3D.hitCenter: gr.setColor(Color.pink); break;
- case Object3D.hitRotate: gr.setColor(Color.green); break;
- case Object3D.hitScale: gr.setColor(Color.cyan); break;
+ info.DX = X;
+ if (X != 0)
+ info.DX -= info.bounds.width/2;
+
+ info.DY = Y;
+ if (Y != 0)
+ info.DY -= info.bounds.height/2;
}
-
- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+
+ object.drawEditHandles(//info,
+ 0);
+
+ if (drag && (X != 0 || Y != 0))
+ {
+ switch (hitSomething)
+ {
+ case Object3D.hitCenter: gr.setColor(Color.white);
+ 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;
+ }
+
+ }
}
}
}
@@ -15533,7 +16605,7 @@
if (hasMarquee)
{
gr.setXORMode(Color.white);
- gr.setColor(Color.red);
+ gr.setColor(Color.white);
if (!firstime)
{
gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
@@ -15692,7 +16764,8 @@
public boolean mouseDrag(Event evt, int x, int y)
{
- //System.out.println("mouseDrag: " + evt);
+ System.out.println("mouseDrag: " + evt);
+ System.exit(0);
/*
drag = true;
//System.out.println("Mouse DRAG");
@@ -15811,6 +16884,7 @@
public boolean mouseUp(Event evt, int x, int y)
{
System.out.println("mouseUp: " + evt);
+ System.exit(0);
/*
locked = false;
if (isRenderer)
@@ -16000,6 +17074,8 @@
private /*static*/ boolean firstime;
private /*static*/ cVector newView = new cVector();
private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
@@ -16012,29 +17088,67 @@
{
com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
+ int usedsuf = 0;
+
for (int i = 0; i < suffixes.length; i++)
{
- String resourceName = basename + suffixes[i] + "." + suffix;
- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
- mipmapped,
- FileUtil.getFileSuffix(resourceName));
- if (data == null)
+ String[] suffixe = suffixes;
+ String[] fallback = suffixes2;
+ String[] fallfallback = suffixes3;
+
+ for (int c=usedsuf; --c>=0;)
{
- throw new IOException("Unable to load texture " + resourceName);
+// String[] temp = suffixe;
+// suffixe = fallback;
+// fallback = fallfallback;
+// fallfallback = temp;
}
+
+ String resourceName = basename + suffixe[i] + "." + suffix;
+ TextureData data;
+
+ try
+ {
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
+ mipmapped,
+ FileUtil.getFileSuffix(resourceName));
+ }
+ catch (Exception e)
+ {
+ try
+ {
+ resourceName = basename + fallback[i] + "." + suffix;
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
+ mipmapped,
+ FileUtil.getFileSuffix(resourceName));
+ }
+ catch (Exception e2)
+ {
+ resourceName = basename + fallfallback[i] + "." + suffix;
+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
+ mipmapped,
+ FileUtil.getFileSuffix(resourceName));
+ }
+ }
+
//System.out.println("Target = " + targets[i]);
cubemap.updateImage(data, targets[i]);
}
return cubemap;
}
+
int bigsphere = -1;
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)
+ if (//envyoff ||
+ WIREFRAME ||
+ cubemap == null)
{
gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
gl.glClear(gl.GL_COLOR_BUFFER_BIT);
@@ -16049,7 +17163,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);
@@ -16081,6 +17205,7 @@
{
gl.glScalef(1.0f, -1.0f, 1.0f);
}
+ gl.glScalef(-1.0f, 1.0f, 1.0f);
gl.glMultMatrixd(viewrot_1, 0);
gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
//viewer.updateInverseRotation(gl);
@@ -16121,7 +17246,8 @@
gl.glDisable(GL.GL_TEXTURE_GEN_R);
cubemap.disable();
- ////cubemap.unbind();
+ //cubemap.dispose();
+
if (CULLFACE)
{
gl.glEnable(gl.GL_CULL_FACE);
@@ -16177,7 +17303,7 @@
gl.glScalef(1.0f, -1.0f, 1.0f);
}
- gl.glNormal3f(0.0f, 0.0f, 1.0f);
+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
float step = 2; // 0.1666f; //0.25f;
float stepv = 2; // step * 1652 / 998;
@@ -16221,16 +17347,16 @@
cStatic.objectstack[materialdepth++] = checker;
//System.out.println("material " + material);
//Applet3D.tracein(this, selected);
- vector2buffer = checker.projectedVertices;
+ //vector2buffer = checker.projectedVertices;
//checker.GetMaterial().Draw(this, false); // true);
- DrawMaterial(checker.GetMaterial(), false); // true);
+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
materialdepth -= 1;
if (materialdepth > 0)
{
- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
}
//checker.GetMaterial().opacity = 1f;
////checker.GetMaterial().ambient = 1f;
@@ -16316,6 +17442,14 @@
}
}
+ private Object3D GetFolder()
+ {
+ Object3D folder = object.GetWindow().copy;
+ if (object.GetWindow().copy.selection.Size() > 0)
+ folder = object.GetWindow().copy.selection.elementAt(0);
+ return folder;
+ }
+
class SelectBuffer implements GLEventListener
{
@@ -16331,7 +17465,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();
@@ -16395,6 +17529,17 @@
//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
+ if (PAINTMODE)
+ {
+ if (object.GetWindow().copy.selection.Size() > 0)
+ {
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
+
+ // Make what you paint not selectable.
+ paintobj.ResetSelectable();
+ }
+ }
+
//int tmp = selection_view;
//selection_view = -1;
int temp = DrawMode();
@@ -16406,6 +17551,17 @@
// temp = DEFAULT; // patch for selection debug
Globals.drawMode = temp; // WARNING
+ if (PAINTMODE)
+ {
+ if (object.GetWindow().copy.selection.Size() > 0)
+ {
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
+
+ // Revert.
+ paintobj.RestoreSelectable();
+ }
+ }
+
//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
// trying different ways of getting the depth info over
@@ -16436,7 +17592,7 @@
float depth = depths[y * TEX_SIZE + x];
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
{
pointselection = false;
@@ -16453,6 +17609,8 @@
// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
+
+ CreateSelectedPoint();
// Will fit the mesh !!!
selectedpoint.toParent[0][0] = 0.0001;
@@ -16507,29 +17665,31 @@
}
if (!movingcamera && !PAINTMODE)
- object.editWindow.ScreenFitPoint(); // fev 2014
+ object.GetWindow().ScreenFitPoint(); // fev 2014
- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
{
- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
- Object3D group = new Object3D("inst" + paintcount++);
+ if (object.GetWindow().copy.selection.Size() > 0)
+ {
+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
- group.CreateMaterial(); // use a void leaf to select instances
-
- group.add(paintobj); // link
-
- object.editWindow.SnapObject(group);
-
- Object3D folder = object.editWindow.copy;
-
- if (object.editWindow.copy.selection.Size() > 0)
- folder = object.editWindow.copy.selection.elementAt(0);
-
- folder.add(group);
-
- object.editWindow.ResetModel();
- object.editWindow.refreshContents();
+ Object3D inst = new Object3D("inst" + paintcount++);
+
+ inst.CreateMaterial(); // use a void leaf to select instances
+
+ inst.add(paintobj); // link
+
+ object.GetWindow().SnapObject(inst);
+
+ Object3D folder = paintFolder; // GetFolder();
+
+ folder.add(inst);
+
+ object.GetWindow().ResetModel();
+ object.GetWindow().refreshContents();
+ }
}
else
paintcount = 0;
@@ -16568,6 +17728,11 @@
//System.out.println("objects[color] = " + objects[color]);
//objects[color].Select();
indexcount = 0;
+ ObjEditor window = object.GetWindow();
+ if (window != null && deselect)
+ {
+ window.Select(null, deselect, true);
+ }
object.Select(color, deselect);
}
@@ -16618,6 +17783,7 @@
public void init(GLAutoDrawable drawable)
{
+ if (Globals.DEBUG)
System.out.println("shadow buffer init");
GL gl = drawable.getGL();
@@ -16846,10 +18012,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;
@@ -16860,7 +18030,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;
@@ -16943,7 +18113,7 @@
double scale = ray.z; // 1; // cos
- float depth = pixels[newindex];
+ float depth = depths[newindex];
/*
int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
@@ -17086,6 +18256,11 @@
static boolean DEBUG_SELECTION = false;
boolean OCCLUSION_CULLING = false; //true;
public boolean lightMode = false;
+
+ private boolean keepshadow;
+
+ static public boolean capsLocked = false; // VR
+
static public int indexcount = 0;
/*static*/ cColor vertexOcclusion = new cColor();
//private int selection_view = -1;
@@ -17093,23 +18268,15 @@
int AAbuffersize = 0;
//double[] selectedpoint = new double[3];
- static Superellipsoid selectedpoint = new Superellipsoid();
+ static Superellipsoid selectedpoint;
static Sphere previousselectedpoint = null;
- static Sphere debugpointG = new Sphere();
- static Sphere debugpointP = new Sphere();
- static Sphere debugpointC = new Sphere();
- static Sphere debugpointR = new Sphere();
+ static Sphere debugpointG;
+ static Sphere debugpointP;
+ static Sphere debugpointC;
+ static Sphere debugpointR;
static Sphere debugpoints[] = new Sphere[8];
- static
- {
- for (int i=0; i<8; i++)
- {
- debugpoints[i] = new Sphere();
- }
- }
-
static void InitPoints(float radius)
{
for (int i=0; i<8; i++)
@@ -17148,11 +18315,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