From 57c5b6cd8d12ffdaa3e0b099451e3c031012750a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 03 Oct 2019 20:34:32 -0400
Subject: [PATCH] Fix lighttouched
---
ObjEditor.java | 149 +++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 8d2ff7b..05fa7cb 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -833,6 +833,11 @@
ScriptNode sn = (ScriptNode) sel;
si.SendInfo(" Script name: " + sn.filename, "regular");
}
+ if (sel instanceof SwitchNode)
+ {
+ SwitchNode sn = (SwitchNode) sel;
+ si.SendInfo(" Switch Object: " + sn.switchobject, "regular");
+ }
si.SendInfo((debug ? " Path: " : " ") + sel.GetPath(), "regular");
@@ -1864,6 +1869,52 @@
cButton fullsceneButton;
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Tom!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/tom.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/adameve.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Adam and Eve!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/adameve.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.Return();
+
fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
fullsceneButton.setToolTipText("Alsace!");
fullsceneButton.addActionListener(new ActionListener()
@@ -2093,86 +2144,17 @@
});
fullscenePanel.Return();
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Tom!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/tom.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/adameve.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Adam and Eve!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/adameve.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.Return();
-
- fullscenePanel.add(new cGridBag());
- fullscenePanel.add(new cGridBag());
-
+
sceneTabbedPane.add(optionsPanel);
scenePanel.add(sceneTabbedPane);
+ cButton creditButton;
+
cGridBag creditsPanel = new cGridBag().setVertical(true);
creditsPanel.setName("Credits");
- cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
- creditsPanel.add(ogaLabel);
-
- cButton creditButton;
- creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
- creditButton.setToolTipText("https://opengameart.org");
-
- creditButton.addMouseListener(new MouseAdapter()
- {
- public void mouseClicked(MouseEvent e)
- {
- try
- {
- Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
- } catch (Exception e1)
-// } catch (java.io.IOException | java.net.URISyntaxException e1)
- {
- e1.printStackTrace();
- }
- }
- });
-
- ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
+ cLabel ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
creditsPanel.add(ogaLabel);
creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
@@ -2229,6 +2211,27 @@
}
});
+ ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
+ creditsPanel.add(ogaLabel);
+
+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
+ creditButton.setToolTipText("https://opengameart.org");
+
+ creditButton.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ try
+ {
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
+ } catch (Exception e1)
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
+ {
+ e1.printStackTrace();
+ }
+ }
+ });
+
for (int i=6; --i>=0;)
{
creditsPanel.add(new cGridBag());
--
Gitblit v1.6.2