From 5e6a6f3319f0c4c687fe71952ac9ecc17792b83a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 10 Jun 2019 20:37:18 -0400
Subject: [PATCH] Fix normal for mesh
---
GroupEditor.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index acdf1fc..3fdc5c4 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -154,6 +154,11 @@
oe.menuBar.add(menu = new Menu("Edit"));
//editItem = menu.add(new MenuItem("Edit"));
//editItem.addActionListener(this);
+ undoItem = menu.add(new MenuItem("Undo"));
+ undoItem.addActionListener(this);
+ redoItem = menu.add(new MenuItem("Redo"));
+ redoItem.addActionListener(this);
+ menu.add("-");
duplicateItem = menu.add(new MenuItem("Duplicate"));
duplicateItem.addActionListener(this);
cloneItem = menu.add(new MenuItem("Clone"));
@@ -197,7 +202,7 @@
//zBufferItem.addActionListener(this);
//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
//normalLensItem.addActionListener(this);
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
revertCameraItem.addActionListener(this);
cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
@@ -261,7 +266,7 @@
// animationItem.addItemListener(this);
// animationItem.setState(CameraPane.ANIMATION);
cameraMenu.add("-");
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
editCameraItem.addActionListener(this);
if (Globals.ADVANCED)
@@ -2005,6 +2010,14 @@
{
loadClipboard(true);
} else
+ if (source == undoItem)
+ {
+ Undo();
+ } else
+ if (source == redoItem)
+ {
+ Redo();
+ } else
if (source == duplicateItem)
{
Object3D keep = Grafreed.clipboard;
@@ -3028,7 +3041,7 @@
child.CloseUI();
listUI.remove(child);
- child.editWindow = null; // ???????????
+ //child.editWindow = null; // ???????????
}
objEditor.ctrlPanel.FlushUI();
//objEditor.jTree.clearSelection();
@@ -4297,14 +4310,17 @@
objEditor.SetText(); // jan 2014
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
CameraPane.flash = true;
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
// a camera
{
- CameraPane.camerachangeframe = 0; // don't refuse it
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
+ {
+ CameraPane.camerachangeframe = 0; // don't refuse it
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ }
// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
}
@@ -5145,6 +5161,8 @@
private MenuItem lookFromItem;
private MenuItem switchItem;
private MenuItem cutItem;
+ private MenuItem undoItem;
+ private MenuItem redoItem;
private MenuItem duplicateItem;
private MenuItem cloneItem;
private MenuItem cloneSupportItem;
--
Gitblit v1.6.2