Grafreed.java | ●●●●● patch | view | raw | blame | history | |
GroupEditor.java | ●●●●● patch | view | raw | blame | history | |
ObjEditor.java | ●●●●● patch | view | raw | blame | history | |
icons/shadericons/borderfade.jpg | patch | view | raw | blame | history |
Grafreed.java
.. .. @@ -928,7 +928,7 @@ 928 928 grafreed.universe = new cGroup(); 929 929 grafreed.universe.name = "Grafreed"; 930 930 grafreed.universe.material = new cMaterial(); 931 - grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/tropic";931 + grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/yonder";932 932 grafreed.universe.skyboxext = "jpg"; 933 933 934 934 // theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE; GroupEditor.java
.. .. @@ -1187,6 +1187,10 @@ 1187 1187 boxButton.setToolTipText("Create box"); 1188 1188 boxButton.addActionListener(this); 1189 1189 1190 + row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);1191 + superButton.setToolTipText("Create superellipsoid");1192 + superButton.addActionListener(this);1193 +1190 1194 row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); 1191 1195 sphereButton.setToolTipText("Create sphere"); 1192 1196 sphereButton.addActionListener(this); .. .. @@ -1198,10 +1202,6 @@ 1198 1202 row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); 1199 1203 torusButton.setToolTipText("Create torus"); 1200 1204 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);1205 1205 1206 1206 if (Globals.ADVANCED) 1207 1207 { .. .. @@ -2165,7 +2165,11 @@ 2165 2165 shadow.material = new cMaterial(obj.material); 2166 2166 shadow.material.diffuse = 0.0001f; 2167 2167 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;2169 2173 2170 2174 makeSomething(shadow); 2171 2175 } ObjEditor.java
.. .. @@ -43,6 +43,35 @@ 43 43 44 44 static ObjEditor theFrame; 45 45 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 + } else61 + {62 + object.projectedVertices[i] = new Object3D.cVector2();63 + }64 + /*65 + if(keep.length == 0)66 + object.projectedVertices[0] = new Object3D.cVector2();67 + else68 + object.projectedVertices[0] = keep[0];69 + object.projectedVertices[1] = new Object3D.cVector2();70 + */71 + }72 + }73 + }74 +46 75 public cGridBag GetSeparator() 47 76 { 48 77 cGridBag separator = new cGridBag(); .. .. @@ -2160,6 +2189,21 @@ 2160 2189 }); 2161 2190 presetpanel.add(bump0); 2162 2191 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 +2163 2207 cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF); 2164 2208 halo.setToolTipText("Halo"); 2165 2209 halo.addMouseListener(new MouseAdapter() .. .. @@ -3545,32 +3589,8 @@ 3545 3589 3546 3590 if (multiplyToggle != null) 3547 3591 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 - } else3562 - {3563 - object.projectedVertices[i] = new Object3D.cVector2();3564 - }3565 - /*3566 - if(keep.length == 0)3567 - object.projectedVertices[0] = new Object3D.cVector2();3568 - else3569 - object.projectedVertices[0] = keep[0];3570 - object.projectedVertices[1] = new Object3D.cVector2();3571 - */3572 - }3573 - }3592 +3593 + AllocProjectedVertices(object);3574 3594 3575 3595 SetMaterial(mat, object.projectedVertices); 3576 3596 } icons/shadericons/borderfade.jpgBinary files differ