Normand Briere
2019-08-19 22e8ab6479334206f97b0093f6c5ffd14610cce3
CameraPane.java
....@@ -168,7 +168,7 @@
168168
169169
170170 // OPTIONS
171
- boolean Skinshader = true;
171
+ boolean Skinshader = false; // true;
172172 boolean cameraLight = false;
173173 boolean UVdebug = false;
174174 boolean Udebug = false;
....@@ -2052,9 +2052,9 @@
20522052 switch(viewcode)
20532053 {
20542054 case 0: return "main";
2055
- case 1: return "one";
2056
- case 2: return "two";
2057
- case 3: return "three";
2055
+ case 1: return "Red";
2056
+ case 2: return "Green";
2057
+ case 3: return "Blue";
20582058 case 4: return "light";
20592059 }
20602060
....@@ -10690,9 +10690,18 @@
1069010690 static boolean init = false;
1069110691
1069210692 double[][] matrix = LA.newMatrix();
10693
+
10694
+ // This is to refresh the UI of the material panel.
10695
+ ObjEditor patchMaterial;
1069310696
1069410697 public void display(GLAutoDrawable drawable)
1069510698 {
10699
+ if (patchMaterial.patchMaterial)
10700
+ {
10701
+ patchMaterial.patchMaterial = false;
10702
+ patchMaterial.objectPanel.setSelectedIndex(1);
10703
+ }
10704
+
1069610705 if (Grafreed.savesound && Grafreed.hassound)
1069710706 {
1069810707 Grafreed.wav.save();
....@@ -15282,8 +15291,8 @@
1528215291 case 'K':
1528315292 KOMPACTTEXTURE ^= true;
1528415293 //textures.clear();
15285
- break;
15286
- case 'P': // Texture Projection macros
15294
+ // break;
15295
+ //case 'P': // Texture Projection macros
1528715296 // SAVETEXTURE ^= true;
1528815297 macromode = true;
1528915298 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15404,7 +15413,7 @@
1540415413 targetLookAt.set(manipCamera.lookAt);
1540515414 repaint();
1540615415 break;
15407
- case 'p':
15416
+ case 'P': // p':
1540815417 // c'est quoi ca au juste? spherical ^= true;
1540915418 Skinshader ^= true; programInitialized = false;
1541015419 repaint();