From b6efb029509980fd08ca4ebe28c89cf8d79fa46c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 03 Sep 2019 21:25:24 -0400
Subject: [PATCH] deepCopyNode
---
ObjEditor.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 06f91f8..7f5ac09 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -24,6 +24,7 @@
matrix.Matrix;
import grafeme.ui.*;
+import org.xj3d.ui.swt.widgets.ImageLoader;
class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
ActionListener, ChangeListener,
@@ -141,7 +142,7 @@
try
{
// Much faster!
- image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
+ image = JpegLoader.load(name);
}
catch (Exception e)
{
@@ -4662,9 +4663,8 @@
changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
changed.clear();
-
- changed.skyboxname = obj.skyboxname;
- changed.skyboxext = obj.skyboxext;
+
+ obj.deepCopyNode(changed);
for (int i=0; i<obj.Size(); i++)
{
@@ -4860,11 +4860,14 @@
void SetCameras()
{
- Camera neweye = (Camera)copy.GetObject(cameraView.cameras[0].GetUUID());
- Camera newlight = (Camera)copy.GetObject(cameraView.LightCamera().GetUUID());
-
- cameraView.SetCamera(neweye);
- cameraView.SetLight(newlight);
+ if (copy == Grafreed.grafreed.universe)
+ {
+ Camera neweye = (Camera)copy.GetObject(cameraView.cameras[0].GetUUID());
+ Camera newlight = (Camera)copy.GetObject(cameraView.LightCamera().GetUUID());
+
+ cameraView.SetCamera(neweye);
+ cameraView.SetLight(newlight);
+ }
}
void ImportGFD()
--
Gitblit v1.6.2