From 29d5516687020263d3ae0454ce81879a3a450af0 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 01 Aug 2019 00:20:18 -0400
Subject: [PATCH] Min shader option.
---
GroupEditor.java | 185 ++++++++++++++++++++++++++++++++-------------
1 files changed, 131 insertions(+), 54 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index ee4f34c..f72277a 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("penguins", "yonder", 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);
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
tab0.add(row0);
tab0.add(row1);
@@ -140,24 +141,29 @@
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("mountain", "Teide", row4);
+ AddSkyboxButton("park", "Tantolunden4", row4);
+ AddSkyboxButton("park", "Stairs", row5);
+ AddSkyboxButton("default", "skycube", row6);
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", "MountainTrail", row6);
/*
-Kastellholmen
-Langholmen
-Riddarfjarden
-Skinnarviksberget
-Tanto
-Tantolunden2
-Tantolunden6
+Autumn
+Greenlands
+MountainTrail
+Oasis
+TheRock
+TopOfTheWorld
+Winter
*/
tab0.add(row0);
@@ -197,39 +203,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("persson", "corona", row2);
+ AddSkyboxButton("persson", "spaceskybox", 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("mountain", "Ryfjallet", row6);
tab0.add(row0);
tab0.add(row1);
@@ -245,12 +245,77 @@
//tab0.add(new cGridBag());
}
}
-
+
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
+ {
+ cGridBag tab0 = new cGridBag().setVertical(true);
+
+ tab0.setName("Others");
+ 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("mayhem", "afterrain", row0);
+ AddSkyboxButton("mayhem", "aqua4", row0);
+ AddSkyboxButton("mayhem", "aqua9", row0);
+ AddSkyboxButton("mayhem", "flame", row0);
+
+ AddSkyboxButton("mayhem", "h2s", row1);
+ AddSkyboxButton("mayhem", "prehistoric", row1);
+ AddSkyboxButton("mayhem", "scorched", row1);
+ AddSkyboxButton("penguins", "desertdawn", row1);
+
+ AddSkyboxButton("persson", "Citadella", row2);
+ AddSkyboxButton("persson", "Citadella2", row2);
+ AddSkyboxButton("persson", "clouds1", row2);
+ AddSkyboxButton("penguins", "wrath", row2);
+
+ AddSkyboxButton("persson", "FishermansBastion", row3);
+ AddSkyboxButton("persson", "HeroesSquare", row3);
+ AddSkyboxButton("indoors", "DallasW", row3);
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
+
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
+ AddSkyboxButton("persson", "PereaBeach1", row4);
+ AddSkyboxButton("persson", "PereaBeach2", row4);
+ AddSkyboxButton("persson", "redeclipse", row4);
+
+ AddSkyboxButton("daz", "Greenlands", row5);
+ AddSkyboxButton("daz", "Oasis", row5);
+ AddSkyboxButton("elyvisions", "arch3", row5);
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
+
+ AddSkyboxButton("elyvisions", "rainbow", row6);
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
+ AddSkyboxButton("elyvisions", "heaven", row6);
+ AddSkyboxButton("elyvisions", "hot", 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();
}
@@ -1037,6 +1102,7 @@
AddSkyboxTab0(skyboxpanel);
AddSkyboxTab1(skyboxpanel);
AddSkyboxTab2(skyboxpanel);
+ AddSkyboxTab3(skyboxpanel);
// EDIT panel
editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
@@ -1168,9 +1234,12 @@
smoothCB.setToolTipText("Snapping delay");
smoothCB.addItemListener(this);
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
- slowCB.setToolTipText("Smooth interpolation");
- slowCB.addItemListener(this);
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
+// slowCB.setToolTipText("Smooth interpolation");
+// slowCB.addItemListener(this);
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
+ minshaderCB.setToolTipText("Minimal fast shader");
+ minshaderCB.addItemListener(this);
// constraints.gridy += 1;
// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
@@ -1284,6 +1353,8 @@
cCheckBox localCB;
cCheckBox crowdCB;
cCheckBox smoothCB;
+ cCheckBox minshaderCB;
+
cToggleButton fastCB;
cCheckBox slowCB;
cCheckBox boxCB;
@@ -1355,6 +1426,12 @@
cameraView.ToggleInertia();
cameraView.repaint();
}
+ else if(e.getSource() == minshaderCB)
+ {
+ Globals.MINSHADER ^= true;
+ cameraView.programInitialized = false;
+ cameraView.repaint();
+ }
else if(e.getSource() == localCB)
{
cameraView.ToggleLocal();
--
Gitblit v1.6.2