From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons
---
CameraPane.java | 932 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 634 insertions(+), 298 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index e8d7b60..fdb5f77 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -18,7 +18,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 +33,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
{
@@ -44,6 +48,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;
@@ -60,7 +97,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;
@@ -169,7 +206,8 @@
SetCamera(cam);
- SetLight(new Camera(new cVector(10, 10, -20)));
+ // Warning: not used.
+ SetLight(new Camera(new cVector(15, 10, -20)));
object = o;
@@ -2065,7 +2103,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);
}
@@ -2298,10 +2336,17 @@
HANDLES ^= true;
}
+ Object3D paintFolder;
+
void TogglePaint()
{
PAINTMODE ^= true;
paintcount = 0;
+
+ if (PAINTMODE)
+ {
+ paintFolder = GetFolder();
+ }
}
void SwapCamera(int a, int b)
@@ -2398,6 +2443,21 @@
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);
+ }
+
/**/
class CacheTexture
{
@@ -2406,28 +2466,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;
@@ -2446,13 +2509,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;
@@ -3525,6 +3609,8 @@
System.out.println("LOADING TEXTURE : " + name);
+ Object x = texturedata.getMipmapData(); // .getBuffer();
+
//
if (false) // compressbit > 0)
{
@@ -7923,7 +8009,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);
@@ -7938,8 +8024,8 @@
pigment = null;
}
- ReleaseTexture(bump, true);
- ReleaseTexture(pigment, false);
+ ReleaseTexture(tex, true);
+ ReleaseTexture(tex, false);
}
public void ReleasePigmentTexture(cTexture tex) // INTERFACE
@@ -7957,7 +8043,7 @@
String pigment = Object3D.GetPigment(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);
@@ -7968,7 +8054,7 @@
pigment = null;
}
- ReleaseTexture(pigment, false);
+ ReleaseTexture(tex, false);
}
public void ReleaseBumpTexture(cTexture tex) // INTERFACE
@@ -7986,7 +8072,7 @@
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);
@@ -7997,10 +8083,10 @@
bump = null;
}
- ReleaseTexture(bump, true);
+ ReleaseTexture(tex, true);
}
- void ReleaseTexture(String tex, boolean bump)
+ void ReleaseTexture(cTexture tex, boolean bump)
{
if (// DrawMode() != 0 || /*tex == null ||*/
ambientOcclusion ) // || !textureon)
@@ -8011,7 +8097,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)
@@ -8105,47 +8191,50 @@
/*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;
- }
+// 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;
- String pigment = Object3D.GetPigment(tex);
- String bump = Object3D.GetBump(tex);
-
- usedtextures.put(pigment, pigment);
- usedtextures.put(bump, bump);
-
- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
- {
- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
- // System.out.println("; bump = " + bump);
- }
-
- if (bump.equals(""))
- {
- bump = null;
- }
- 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
@@ -8164,9 +8253,9 @@
String pigment = Object3D.GetPigment(tex);
- usedtextures.put(pigment, pigment);
+ 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);
@@ -8178,7 +8267,7 @@
}
GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
- BindTexture(pigment, false, resolution);
+ BindTexture(tex, false, resolution);
}
/*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
@@ -8197,9 +8286,9 @@
String bump = Object3D.GetBump(tex);
- 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);
@@ -8211,7 +8300,7 @@
}
GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
- BindTexture(bump, true, resolution);
+ BindTexture(tex, true, resolution);
GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
}
@@ -8235,13 +8324,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;
@@ -8251,19 +8346,46 @@
// else
// if (!texname.startsWith("/"))
// texname = "/Users/nbriere/Textures/" + texname;
- if (!FileExists(tex))
+ if (!FileExists(texname))
{
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)
@@ -8274,19 +8396,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"))
@@ -8294,11 +8420,13 @@
// 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.png", bump),resolution);
+ else
+ new Exception().printStackTrace();
} else
{
if (textureon)
@@ -8357,19 +8485,19 @@
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)
@@ -8386,52 +8514,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);
@@ -8448,18 +8541,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;
}
@@ -8475,10 +8570,44 @@
}
}
- 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);
@@ -8496,21 +8625,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);
@@ -8542,9 +8671,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;
@@ -9505,7 +9700,7 @@
if (renderCamera != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
@@ -9521,7 +9716,7 @@
if (renderCamera != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
@@ -10722,7 +10917,7 @@
// if (parentcam != renderCamera) // not a light
if (cam != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
for (int j = 0; j < 4; j++)
{
@@ -10737,7 +10932,7 @@
// if (parentcam != renderCamera) // not a light
if (cam != lightCamera)
//for (int count = parentcam.GetTransformCount(); --count>=0;)
- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
@@ -11028,9 +11223,9 @@
gl.glMatrixMode(GL.GL_MODELVIEW);
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
-//gl.glEnable(gl.GL_MULTISAMPLE);
+gl.glEnable(gl.GL_POLYGON_SMOOTH);
+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
+gl.glEnable(gl.GL_MULTISAMPLE);
} else
{
//gl.glDisable(GL.GL_TEXTURE_2D);
@@ -11041,7 +11236,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();
@@ -11290,7 +11485,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);
@@ -11298,24 +11493,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)
@@ -11527,7 +11719,7 @@
if ((TRACK || SHADOWTRACK) || zoomonce)
{
if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
pingthread.StepToTarget(true); // true);
// zoomonce = false;
}
@@ -11655,20 +11847,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);
+ }
}
}
}
@@ -12197,7 +12401,74 @@
//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
String program =
+ // Min shader
"!!ARBfp1.0\n" +
+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
+ "PARAM pow2 = { 0.5, 0.25, 0.125, 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, zero123.z, -zero123.y;" +
+ Normalize("normal") +
+ "MOV light, state.light[0].position;" +
+ "DP3 ndotl.x, light, normal;" +
+
+ // 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, zero123.y;" +
+ "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.z;" + // backlit
+ "SUB ndotl.y, zero123.y, ndotl.y;" +
+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
+
+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
+
+ // Pigment
+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
+ "LRP temp, zero123.w, temp, one;" + // texture proportion
+ "MUL temp, temp, ndotl.x;" +
+
+ "MUL temp, temp, zero123.z;" +
+
+ //"MUL temp, temp, ndotl.y;" +
+
+ "MOV temp.w, zero123.y;" + // reset alpha
+ "MOV result.color, temp;" +
+ "END";
+
+ String program2 =
+ "!!ARBfp1.0\n" +
+
//"OPTION ARB_fragment_program_shadow;" +
"PARAM light2cam0 = program.env[10];" +
"PARAM light2cam1 = program.env[11];" +
@@ -12312,8 +12583,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];" +
/*
@@ -12334,20 +12604,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;" +
@@ -12718,7 +12988,7 @@
"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;" +
@@ -13145,25 +13415,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)
@@ -13210,7 +13481,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 + ";" +
"";
@@ -13943,7 +14214,7 @@
// fev 2014???
if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
pingthread.StepToTarget(true); // true);
}
// if (!LIVE)
@@ -14008,14 +14279,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;
@@ -14297,12 +14569,12 @@
void GoDown(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
manipCamera.RotatePosition(0, -speed);
else
- manipCamera.BackForth(0, -speed*delta, getWidth());
- */
+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
+ /**/
if ((mod & SHIFT) == SHIFT)
{
mouseMode = mouseMode; // VR??
@@ -14318,12 +14590,12 @@
void GoUp(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
manipCamera.RotatePosition(0, speed);
else
- manipCamera.BackForth(0, speed*delta, getWidth());
- */
+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
+ /**/
if ((mod & SHIFT) == SHIFT)
{
mouseMode = mouseMode;
@@ -14339,12 +14611,12 @@
void GoLeft(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(speed, 0);
- else
manipCamera.Translate(speed*delta, 0, getWidth());
- */
+ else
+ manipCamera.RotatePosition(speed, 0);
+ /**/
if ((mod & SHIFT) == SHIFT)
{
mouseMode = mouseMode;
@@ -14360,12 +14632,12 @@
void GoRight(int mod)
{
MODIFIERS |= COMMAND;
- /*
+ /**/
if((mod&SHIFT) == SHIFT)
- manipCamera.RotatePosition(-speed, 0);
- else
manipCamera.Translate(-speed*delta, 0, getWidth());
- */
+ else
+ manipCamera.RotatePosition(-speed, 0);
+ /**/
if ((mod & SHIFT) == SHIFT)
{
mouseMode = mouseMode;
@@ -14415,15 +14687,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.GetWindow().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)
@@ -14572,24 +14845,27 @@
}
}
+// ClickInfo clickInfo = new ClickInfo();
+
public void mouseMoved(MouseEvent e)
{
//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)
{
//ObjEditor editWindow = object.editWindow;
//Object3D copy = editWindow.copy;
- if (object.doEditClick(ci, 0))
+ if (object.doEditClick(//clickInfo,
+ 0))
{
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else
@@ -14604,7 +14880,8 @@
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());
}
@@ -14860,7 +15137,8 @@
// break;
case 'T':
CACHETEXTURE ^= true;
- textures.clear();
+ texturepigment.clear();
+ texturebump.clear();
// repaint();
break;
case 'Y':
@@ -14945,7 +15223,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;
@@ -14971,13 +15251,7 @@
repaint();
break;
case 'l':
- lightMode ^= true;
- Globals.lighttouched = true;
- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
- targetLookAt.set(manipCamera.lookAt);
- repaint();
- break;
- case 'L':
+ //case 'L':
if (lightMode)
{
lightMode = false;
@@ -15124,7 +15398,10 @@
// kompactbit = 6;
// break;
case ' ':
- ObjEditor.theFrame.ToggleFullScreen();
+ lightMode ^= true;
+ Globals.lighttouched = true;
+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
+ targetLookAt.set(manipCamera.lookAt);
repaint();
break;
//case '`' :
@@ -15190,17 +15467,17 @@
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;
@@ -15424,7 +15701,7 @@
}
*/
- object.editWindow.EditSelection(false);
+ object.GetWindow().EditSelection(false);
}
void SelectParent()
@@ -15441,10 +15718,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;
@@ -15486,12 +15763,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;
@@ -15502,21 +15779,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);
}
@@ -15524,7 +15801,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.PrintMemory();
+ group.GetWindow().PrintMemory();
// group.editWindow.ReduceMesh(true);
}
@@ -15532,7 +15809,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.ResetCentroid();
+ group.GetWindow().ResetCentroid();
}
void IncDepth()
@@ -15614,8 +15891,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");
@@ -15692,48 +15967,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);
- 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;
+ info.DX = X;
+ if (X != 0)
+ info.DX -= info.bounds.width/2;
+
+ info.DY = Y;
+ if (Y != 0)
+ info.DY -= info.bounds.height/2;
}
-
+
+ object.drawEditHandles(//info,
+ 0);
+
+ if (drag && (X != 0 || Y != 0))
+ {
+ switch (hitSomething)
+ {
+ case Object3D.hitCenter: gr.setColor(Color.pink);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ break;
+ case Object3D.hitRotate: gr.setColor(Color.yellow);
+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
+ break;
+ case Object3D.hitScale: gr.setColor(Color.cyan);
+ gr.drawLine(X, Y, 0, 0);
+ break;
+ }
+
+ }
}
}
}
@@ -16531,6 +16835,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
{
@@ -16610,6 +16922,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();
@@ -16621,6 +16944,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
@@ -16724,29 +17058,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;
--
Gitblit v1.6.2