From 6600d22461ccc1cb602f238a9ffa83cf07dd830e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 01 Jul 2019 18:04:02 -0400
Subject: [PATCH] Get icons 256x256
---
CameraPane.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 88a2741..d0c68fd 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -2065,7 +2065,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);
}
@@ -11527,7 +11527,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;
}
@@ -13375,9 +13375,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;" +
@@ -13942,7 +13943,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)
@@ -15119,9 +15120,9 @@
case '_':
kompactbit = 5;
break;
- case '+':
- kompactbit = 6;
- break;
+// case '+':
+// kompactbit = 6;
+// break;
case ' ':
ObjEditor.theFrame.ToggleFullScreen();
repaint();
@@ -15170,8 +15171,9 @@
case DELETE:
ClearSelection();
break;
- /*
case '+':
+
+ /*
//fontsize += 1;
bbzoom *= 2;
repaint();
@@ -15188,17 +15190,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;
@@ -15422,7 +15424,7 @@
}
*/
- object.editWindow.EditSelection(false);
+ object.GetWindow().EditSelection(false);
}
void SelectParent()
@@ -15439,10 +15441,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;
@@ -15484,12 +15486,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;
@@ -15500,21 +15502,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);
}
@@ -15522,7 +15524,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.PrintMemory();
+ group.GetWindow().PrintMemory();
// group.editWindow.ReduceMesh(true);
}
@@ -15530,7 +15532,7 @@
{
//Composite group = (Composite) object;
Object3D group = object;
- group.editWindow.ResetCentroid();
+ group.GetWindow().ResetCentroid();
}
void IncDepth()
@@ -16722,7 +16724,7 @@
}
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)
{
@@ -16734,17 +16736,17 @@
group.add(paintobj); // link
- object.editWindow.SnapObject(group);
+ object.GetWindow().SnapObject(group);
- Object3D folder = object.editWindow.copy;
+ Object3D folder = object.GetWindow().copy;
- if (object.editWindow.copy.selection.Size() > 0)
- folder = object.editWindow.copy.selection.elementAt(0);
+ if (object.GetWindow().copy.selection.Size() > 0)
+ folder = object.GetWindow().copy.selection.elementAt(0);
folder.add(group);
- object.editWindow.ResetModel();
- object.editWindow.refreshContents();
+ object.GetWindow().ResetModel();
+ object.GetWindow().refreshContents();
}
else
paintcount = 0;
--
Gitblit v1.6.2