Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706
Shadow RGB
3 files modified
1 files added
88 ■■■■■ changed files
Grafreed.java 2 ●●● patch | view | raw | blame | history
GroupEditor.java 14 ●●●●● patch | view | raw | blame | history
ObjEditor.java 72 ●●●●● patch | view | raw | blame | history
icons/shadericons/borderfade.jpg patch | view | raw | blame | history
Grafreed.java
....@@ -928,7 +928,7 @@
928928 grafreed.universe = new cGroup();
929929 grafreed.universe.name = "Grafreed";
930930 grafreed.universe.material = new cMaterial();
931
- grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/tropic";
931
+ grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/yonder";
932932 grafreed.universe.skyboxext = "jpg";
933933
934934 // theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
GroupEditor.java
....@@ -1187,6 +1187,10 @@
11871187 boxButton.setToolTipText("Create box");
11881188 boxButton.addActionListener(this);
11891189
1190
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1191
+ superButton.setToolTipText("Create superellipsoid");
1192
+ superButton.addActionListener(this);
1193
+
11901194 row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11911195 sphereButton.setToolTipText("Create sphere");
11921196 sphereButton.addActionListener(this);
....@@ -1198,10 +1202,6 @@
11981202 row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
11991203 torusButton.setToolTipText("Create torus");
12001204 torusButton.addActionListener(this);
1201
-
1202
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1203
- superButton.setToolTipText("Create superellipsoid");
1204
- superButton.addActionListener(this);
12051205
12061206 if (Globals.ADVANCED)
12071207 {
....@@ -2165,7 +2165,11 @@
21652165 shadow.material = new cMaterial(obj.material);
21662166 shadow.material.diffuse = 0.0001f;
21672167 shadow.material.specular = 0.0001f;
2168
- //shadow.projectedVertices[1].x = 300;
2168
+ shadow.material.opacity = 0.75f;
2169
+
2170
+ AllocProjectedVertices(shadow);
2171
+
2172
+ shadow.projectedVertices[1].x = 300;
21692173
21702174 makeSomething(shadow);
21712175 }
ObjEditor.java
....@@ -43,6 +43,35 @@
4343
4444 static ObjEditor theFrame;
4545
46
+ public void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
4675 public cGridBag GetSeparator()
4776 {
4877 cGridBag separator = new cGridBag();
....@@ -2160,6 +2189,21 @@
21602189 });
21612190 presetpanel.add(bump0);
21622191
2192
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2193
+ borderShader.setToolTipText("Border fade");
2194
+ borderShader.addMouseListener(new MouseAdapter()
2195
+ {
2196
+ public void mouseClicked(MouseEvent e)
2197
+ {
2198
+ borderfadeField.setFloat(0.5);
2199
+ opacityField.setFloat(0.6);
2200
+
2201
+ materialtouched = true;
2202
+ applySelf();
2203
+ }
2204
+ });
2205
+ presetpanel.add(borderShader);
2206
+
21632207 cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21642208 halo.setToolTipText("Halo");
21652209 halo.addMouseListener(new MouseAdapter()
....@@ -3545,32 +3589,8 @@
35453589
35463590 if (multiplyToggle != null)
35473591 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
- assert (object.projectedVertices != null);
3550
-
3551
- if (object.projectedVertices.length <= 2)
3552
- {
3553
- // Side effect...
3554
- Object3D.cVector2[] keep = object.projectedVertices;
3555
- object.projectedVertices = new Object3D.cVector2[3];
3556
- for (int i = 0; i < 3; i++)
3557
- {
3558
- if (i < keep.length)
3559
- {
3560
- object.projectedVertices[i] = keep[i];
3561
- } else
3562
- {
3563
- object.projectedVertices[i] = new Object3D.cVector2();
3564
- }
3565
- /*
3566
- if(keep.length == 0)
3567
- object.projectedVertices[0] = new Object3D.cVector2();
3568
- else
3569
- object.projectedVertices[0] = keep[0];
3570
- object.projectedVertices[1] = new Object3D.cVector2();
3571
- */
3572
- }
3573
- }
3592
+
3593
+ AllocProjectedVertices(object);
35743594
35753595 SetMaterial(mat, object.projectedVertices);
35763596 }
icons/shadericons/borderfade.jpg
Binary files differ