From 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 29 Jul 2019 20:08:48 -0400
Subject: [PATCH] Save skybox.
---
GroupEditor.java | 324 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 222 insertions(+), 102 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 696071e..3cb24f8 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -24,11 +24,12 @@
ItemListener // ListSelectionListener
{
- public void AddSkyboxButton(String f, String s, cGridBag row3)
+ public void AddSkyboxButton(String f, String s, cGridBag row)
{
cButton skyboxButton;
final String path = "cubemaps/" + f + "-skyboxes/" + s;
- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
skyboxButton.setToolTipText(s);
skyboxButton.addActionListener(new ActionListener()
{
@@ -40,11 +41,219 @@
});
}
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
+ {
+ cGridBag tab0 = new cGridBag().setVertical(true);
+
+ tab0.setName("Urban");
+ skyboxpanel.add(tab0);
+
+ cGridBag row0 = new cGridBag();
+ cGridBag row1 = new cGridBag();
+ cGridBag row2 = new cGridBag();
+ cGridBag row3 = new cGridBag();
+ cGridBag row4 = new cGridBag();
+ cGridBag row5 = new cGridBag();
+ cGridBag row6 = new cGridBag();
+
+ AddSkyboxButton("default", "rgb", row0);
+ //AddSkyboxButton("default", "cornell", row0);
+ AddSkyboxButton("penguins", "dust", row0);
+ AddSkyboxButton("penguins", "tropic", row0);
+ AddSkyboxButton("default", "skycube", row0);
+
+ AddSkyboxButton("default", "uffizi", row1);
+ AddSkyboxButton("bridge", "Bridge", row1);
+ AddSkyboxButton("bridge", "Bridge2", row1);
+ AddSkyboxButton("urban", "GamlaStan2", row1);
+
+ AddSkyboxButton("urban", "Parliament", row2);
+ AddSkyboxButton("urban", "Roundabout", row2);
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
+
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
+ AddSkyboxButton("urban", "UnionSquare", row3);
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
+ AddSkyboxButton("park", "BerzeliiPark", row3);
+
+ AddSkyboxButton("park", "Buddha", row4);
+ AddSkyboxButton("park", "CNTower2", row4);
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
+
+ AddSkyboxButton("park", "Park", row5);
+ AddSkyboxButton("park", "Pond", row5);
+ AddSkyboxButton("park", "Skansen", row5);
+ AddSkyboxButton("park", "Skansen2", row5);
+
+ AddSkyboxButton("park", "Skansen3", row6);
+ AddSkyboxButton("park", "Skansen4", row6);
+ AddSkyboxButton("park", "Skansen5", row6);
+ AddSkyboxButton("park", "Stairs", row6);
+
+ tab0.add(row0);
+ tab0.add(row1);
+ tab0.add(row2);
+ tab0.add(row3);
+ tab0.add(row4);
+ tab0.add(row5);
+ tab0.add(row6);
+
+ for (int i=5; --i>=0;)
+ {
+ //oe.toolboxPanel.Return();
+ //tab0.add(new cGridBag());
+ }
+ }
+
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
+ {
+ cGridBag tab0 = new cGridBag().setVertical(true);
+
+ tab0.setName("Nature");
+ skyboxpanel.add(tab0);
+
+ cGridBag row0 = new cGridBag();
+ cGridBag row1 = new cGridBag();
+ cGridBag row2 = new cGridBag();
+ cGridBag row3 = new cGridBag();
+ cGridBag row4 = new cGridBag();
+ cGridBag row5 = new cGridBag();
+ cGridBag row6 = new cGridBag();
+
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
+ AddSkyboxButton("beach", "PalmTrees", row0);
+ AddSkyboxButton("beach", "Tenerife", row0);
+
+ AddSkyboxButton("beach", "Tenerife2", row1);
+ AddSkyboxButton("beach", "Tenerife3", row1);
+ AddSkyboxButton("field", "FishPond", row1);
+ AddSkyboxButton("field", "Footballfield", row1);
+
+ AddSkyboxButton("field", "Meadow", row2);
+ AddSkyboxButton("field", "Sorsele", row2);
+ AddSkyboxButton("field", "Sorsele2", row2);
+ AddSkyboxButton("field", "Sorsele3", row2);
+
+ AddSkyboxButton("forest", "Brudslojan", row3);
+ AddSkyboxButton("forest", "Langholmen2", row3);
+ AddSkyboxButton("forest", "Plants", row3);
+ AddSkyboxButton("mountain", "Maskonaive", row3);
+
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
+ AddSkyboxButton("mountain", "Ryfjallet", row4);
+ AddSkyboxButton("mountain", "Teide", row4);
+ AddSkyboxButton("park", "Tantolunden4", row4);
+
+ AddSkyboxButton("penguins", "wrath", row5);
+ AddSkyboxButton("penguins", "yonder", row5);
+ AddSkyboxButton("rocky", "Langholmen", row5);
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
+
+ AddSkyboxButton("default", "CloudyHills", row6);
+ AddSkyboxButton("daz", "Autumn", row6);
+ AddSkyboxButton("daz", "Greenlands", row6);
+ AddSkyboxButton("daz", "MountainTrail", row6);
+ AddSkyboxButton("daz", "Oasis", row6);
+ /*
+Autumn
+Greenlands
+MountainTrail
+Oasis
+TheRock
+TopOfTheWorld
+Winter
+ */
+
+ tab0.add(row0);
+ tab0.add(row1);
+ tab0.add(row2);
+ tab0.add(row3);
+ tab0.add(row4);
+ tab0.add(row5);
+ tab0.add(row6);
+
+ for (int i=5; --i>=0;)
+ {
+ //oe.toolboxPanel.Return();
+ //tab0.add(new cGridBag());
+ }
+ }
+
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
+ {
+ cGridBag tab0 = new cGridBag().setVertical(true);
+
+ tab0.setName("Night");
+ skyboxpanel.add(tab0);
+
+ cGridBag row0 = new cGridBag();
+ cGridBag row1 = new cGridBag();
+ cGridBag row2 = new cGridBag();
+ cGridBag row3 = new cGridBag();
+ cGridBag row4 = new cGridBag();
+ cGridBag row5 = new cGridBag();
+ cGridBag row6 = new cGridBag();
+
+ AddSkyboxButton("night", "NightPath", row0);
+ AddSkyboxButton("night", "PondNight", row0);
+ AddSkyboxButton("night", "Powerlines", row0);
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
+
+ AddSkyboxButton("urban", "CNTower", row1);
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
+
+ AddSkyboxButton("penguins", "kenon_star", row2);
+ AddSkyboxButton("indoors", "DallasW", row2);
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
+ AddSkyboxButton("indoors", "Vasa", row2);
+
+ AddSkyboxButton("winter", "Backyard", row3);
+ AddSkyboxButton("winter", "Creek", row3);
+ AddSkyboxButton("winter", "FootballField3", row3);
+ AddSkyboxButton("winter", "Forest", row3);
+
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
+ AddSkyboxButton("winter", "House", row4);
+ AddSkyboxButton("winter", "IceLake", row4);
+ AddSkyboxButton("winter", "IceRiver", row4);
+
+ AddSkyboxButton("winter", "Park3", row5);
+ AddSkyboxButton("winter", "PondWinter", row5);
+ AddSkyboxButton("winter", "Tantolunden5", row5);
+ AddSkyboxButton("winter", "Vindelalven", row5);
+
+ AddSkyboxButton("daz", "TheRock", row6);
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
+ AddSkyboxButton("daz", "Winter", row6);
+ AddSkyboxButton("penguins", "desertdawn", row6);
+
+ tab0.add(row0);
+ tab0.add(row1);
+ tab0.add(row2);
+ tab0.add(row3);
+ tab0.add(row4);
+ tab0.add(row5);
+ tab0.add(row6);
+
+ for (int i=5; --i>=0;)
+ {
+ //oe.toolboxPanel.Return();
+ //tab0.add(new cGridBag());
+ }
+ }
+
public void ChangeSkybox(String name)
{
- cameraView.envyoff = false;
- cameraView.skyboxname = name;
- cameraView.skyboxext = "jpg";
+ //cameraView.envyoff = false;
+ group.skyboxname = name;
+ group.skyboxext = "jpg";
cameraView.repaint();
}
@@ -820,106 +1029,17 @@
oe.toolboxPanel.add(row2);
// ENVYMAPS
- cGridBag row3 = new cGridBag();
- row3.preferredHeight = 20;
+ cGridBag skyboxpane = new cGridBag();
+ skyboxpane.preferredHeight = 100;
- AddSkyboxButton("default", "rgb", row3);
- AddSkyboxButton("default", "cornell", row3);
- AddSkyboxButton("default", "uffizi", row3);
- AddSkyboxButton("default", "CloudyHills", row3);
- AddSkyboxButton("default", "skycube", row3);
-
- oe.toolboxPanel.add(row3);
-
- cGridBag row4 = new cGridBag();
- row4.preferredHeight = 20;
+ oe.toolboxPanel.add(skyboxpane);
- AddSkyboxButton("bridge", "Bridge2", row4);
- AddSkyboxButton("urban", "GamlaStan2", row4);
- AddSkyboxButton("urban", "Parliament", row4);
- AddSkyboxButton("urban", "Roundabout", row4);
+ JTabbedPane skyboxpanel = new JTabbedPane();
+ skyboxpane.add(skyboxpanel);
- oe.toolboxPanel.add(row4);
-
- cGridBag row5 = new cGridBag();
- row5.preferredHeight = 20;
-
- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
- AddSkyboxButton("urban", "UnionSquare", row5);
-
- oe.toolboxPanel.add(row5);
-
- cGridBag row6 = new cGridBag();
- row6.preferredHeight = 20;
-
- AddSkyboxButton("park", "BerzeliiPark", row6);
- AddSkyboxButton("park", "Buddha", row6);
- AddSkyboxButton("park", "CNTower2", row6);
- //AddSkyboxButton("park", "Fatbursparken", row6);
- AddSkyboxButton("park", "NiagaraFalls1", row6);
-
- oe.toolboxPanel.add(row6);
-
- cGridBag row7 = new cGridBag();
- row7.preferredHeight = 20;
-
- AddSkyboxButton("park", "NiagaraFalls3", row7);
- AddSkyboxButton("park", "Park", row7);
- //AddSkyboxButton("park", "Park2", row6);
- //AddSkyboxButton("park", "Path", row6);
- AddSkyboxButton("park", "Pond", row7);
- AddSkyboxButton("park", "Skansen", row7);
-
- oe.toolboxPanel.add(row7);
-
- cGridBag row8 = new cGridBag();
- row8.preferredHeight = 20;
-
- AddSkyboxButton("park", "Skansen2", row8);
- AddSkyboxButton("park", "Skansen3", row8);
- AddSkyboxButton("park", "Skansen4", row8);
- AddSkyboxButton("park", "Skansen5", row8);
-
- oe.toolboxPanel.add(row8);
-
- cGridBag row9 = new cGridBag();
- row9.preferredHeight = 20;
-
- AddSkyboxButton("park", "Stairs", row9);
- //AddSkyboxButton("park", "Tantolunden", row6);
- //AddSkyboxButton("park", "Tantolunden3", row6);
- AddSkyboxButton("park", "Tantolunden4", row9);
-
- oe.toolboxPanel.add(row9);
-/*
-BerzeliiPark
-Buddha
-CNTower2
-Fatbursparken
-NiagaraFalls1
-NiagaraFalls3
-Park
-Park2
-Path
-Pond
-Skansen
-Skansen2
-Skansen3
-Skansen4
-Skansen5
-Stairs
-Tantolunden
-Tantolunden3
-Tantolunden4
- */
-
- for (int i=1; --i>=0;)
- {
- //oe.toolboxPanel.Return();
- oe.toolboxPanel.add(new cGridBag());
- }
+ AddSkyboxTab0(skyboxpanel);
+ AddSkyboxTab1(skyboxpanel);
+ AddSkyboxTab2(skyboxpanel);
// EDIT panel
editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
--
Gitblit v1.6.2