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 | 99 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index ee4f34c..3cb24f8 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -28,8 +28,8 @@
{
cButton skyboxButton;
final String path = "cubemaps/" + f + "-skyboxes/" + s;
- //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
- row.add(skyboxButton = GetButton(path + "/negx.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()
{
@@ -57,11 +57,12 @@
cGridBag row6 = new cGridBag();
AddSkyboxButton("default", "rgb", row0);
- AddSkyboxButton("default", "cornell", row0);
- AddSkyboxButton("default", "uffizi", row0);
- AddSkyboxButton("default", "CloudyHills", row0);
-
- AddSkyboxButton("default", "skycube", row1);
+ //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);
@@ -73,23 +74,23 @@
AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
AddSkyboxButton("urban", "UnionSquare", row3);
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
AddSkyboxButton("park", "BerzeliiPark", row3);
- AddSkyboxButton("park", "Buddha", row3);
+ AddSkyboxButton("park", "Buddha", row4);
AddSkyboxButton("park", "CNTower2", row4);
AddSkyboxButton("park", "NiagaraFalls1", row4);
AddSkyboxButton("park", "NiagaraFalls3", row4);
- AddSkyboxButton("park", "Park", row4);
+ AddSkyboxButton("park", "Park", row5);
AddSkyboxButton("park", "Pond", row5);
AddSkyboxButton("park", "Skansen", row5);
AddSkyboxButton("park", "Skansen2", row5);
- AddSkyboxButton("park", "Skansen3", row5);
+ AddSkyboxButton("park", "Skansen3", row6);
AddSkyboxButton("park", "Skansen4", row6);
AddSkyboxButton("park", "Skansen5", row6);
AddSkyboxButton("park", "Stairs", row6);
- AddSkyboxButton("park", "Tantolunden4", row6);
tab0.add(row0);
tab0.add(row1);
@@ -140,24 +141,32 @@
AddSkyboxButton("forest", "Langholmen2", row3);
AddSkyboxButton("forest", "Plants", row3);
AddSkyboxButton("mountain", "Maskonaive", row3);
- AddSkyboxButton("mountain", "Maskonaive2", row4);
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
AddSkyboxButton("mountain", "Maskonaive3", row4);
AddSkyboxButton("mountain", "Ryfjallet", row4);
- AddSkyboxButton("mountain", "Teide", row4);
+ AddSkyboxButton("mountain", "Teide", row4);
+ AddSkyboxButton("park", "Tantolunden4", row4);
+ AddSkyboxButton("penguins", "wrath", row5);
+ AddSkyboxButton("penguins", "yonder", row5);
AddSkyboxButton("rocky", "Langholmen", row5);
- AddSkyboxButton("rocky", "Riddarfjarden", 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);
/*
-Kastellholmen
-Langholmen
-Riddarfjarden
-Skinnarviksberget
-Tanto
-Tantolunden2
-Tantolunden6
+Autumn
+Greenlands
+MountainTrail
+Oasis
+TheRock
+TopOfTheWorld
+Winter
*/
tab0.add(row0);
@@ -197,39 +206,33 @@
AddSkyboxButton("urban", "CNTower", row1);
AddSkyboxButton("bridge", "ArstaBridge", row1);
- AddSkyboxButton("indoors", "DallasW", row1);
- AddSkyboxButton("indoors", "MarriottMadisonWest", 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", row2);
- AddSkyboxButton("winter", "Creek", row2);
- AddSkyboxButton("winter", "FootballField3", row2);
+ AddSkyboxButton("winter", "Backyard", row3);
+ AddSkyboxButton("winter", "Creek", row3);
+ AddSkyboxButton("winter", "FootballField3", row3);
AddSkyboxButton("winter", "Forest", row3);
- AddSkyboxButton("winter", "HornstullsStrand2", row3);
- AddSkyboxButton("winter", "House", row3);
- AddSkyboxButton("winter", "IceLake", row3);
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
+ AddSkyboxButton("winter", "House", row4);
+ AddSkyboxButton("winter", "IceLake", row4);
AddSkyboxButton("winter", "IceRiver", row4);
- AddSkyboxButton("winter", "Park3", row4);
- AddSkyboxButton("winter", "PondWinter", row4);
+ AddSkyboxButton("winter", "Park3", row5);
+ AddSkyboxButton("winter", "PondWinter", row5);
AddSkyboxButton("winter", "Tantolunden5", row5);
AddSkyboxButton("winter", "Vindelalven", row5);
- /*
-Backyard
-Creek
-FootballField3
-Forest
-HornstullsStrand2
-House
-IceLake
-IceRiver
-Park3
-PondWinter
-Tantolunden5
-Vindelalven *
- */
+
+ AddSkyboxButton("daz", "TheRock", row6);
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
+ AddSkyboxButton("daz", "Winter", row6);
+ AddSkyboxButton("penguins", "desertdawn", row6);
tab0.add(row0);
tab0.add(row1);
@@ -248,9 +251,9 @@
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();
}
--
Gitblit v1.6.2