From 480ad70047e54b2b92f974e6c2ac5a6c0bdc5a5c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 18 Aug 2019 13:56:09 -0400
Subject: [PATCH] Fix new + checkbox
---
ObjEditor.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 8108843..098f83d 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -72,6 +72,21 @@
}
}
+ public Composite CreateCameras()
+ {
+ Composite cams = new cTemplate();
+ cams.name = "Cameras";
+ copy.insertElementAt(cams, 0);
+
+ cams.addChild(new Camera());
+ cams.addChild(new Camera(1));
+ cams.addChild(new Camera(2));
+ cams.addChild(new Camera(3));
+ cams.addChild(new Camera(4));
+
+ return cams;
+ }
+
public cGridBag GetSeparator()
{
cGridBag separator = new cGridBag();
@@ -1550,23 +1565,9 @@
if (cam == null || !(copy.get(0) instanceof cGroup))
{
- if (Globals.DEBUG)
- System.out.println("CREATE CAMERAS");
- cams = new cTemplate();
- cams.name = "Cameras";
- copy.insertElementAt(cams, 0);
- //cams.parent = copy;
-
- cam = new Camera(); // LA.newVector(3, 2, 1));
- cams.addChild(cam);
- cam = new Camera(1);
- cams.addChild(cam);
- cam = new Camera(2);
- cams.addChild(cam);
- cam = new Camera(3);
- cams.addChild(cam);
- cam = new Camera(4); // Light
- cams.addChild(cam);
+ if (Globals.DEBUG)
+ System.out.println("CREATE CAMERAS");
+ cams = CreateCameras();
} else
{
cams = (cGroup) copy.get(0);
@@ -1718,24 +1719,24 @@
//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
//tmp.setName("Edit");
+ objectPanel.add(skyboxPanel);
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
+
objectPanel.add(toolboxPanel);
- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
- objectPanel.setToolTipTextAt(0, "Objects & textures");
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
objectPanel.add(materialPanel);
- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
- objectPanel.setToolTipTextAt(1, "Material");
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
+ objectPanel.setToolTipTextAt(2, "Material");
- objectPanel.add(skyboxPanel);
- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
- objectPanel.setToolTipTextAt(2, "Backgrounds");
-
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
objectPanel.setToolTipTextAt(3, "Edit controls");
objectPanel.add(transformPanel);
@@ -1744,7 +1745,7 @@
patchMaterial = true;
cameraView.patchMaterial = this;
- objectPanel.setSelectedIndex(1);
+ objectPanel.setSelectedIndex(2);
/*
aConstraints.gridx = 0;
@@ -4206,8 +4207,12 @@
copy.selection.clear();
+ if (copy == Grafreed.grafreed.universe)
+ {
+ CreateCameras();
+ cameraView.SetCamera(GetCamera(copy, 0));
+ }
ResetModel();
- SetupViews();
objEditor.refreshContents();
}
--
Gitblit v1.6.2