Normand Briere
2019-09-06 9cc83b97378c48bae3792064f2d01b2f954c0e01
Fix cone.
5 files modified
19 ■■■■ changed files
BiparamEditor.java 2 ●●● patch | view | raw | blame | history
CameraPane.java 12 ●●●● patch | view | raw | blame | history
Cone.java 4 ●●●● patch | view | raw | blame | history
Object3D.java 1 ●●●● patch | view | raw | blame | history
whitenoise.jpg patch | view | raw | blame | history
BiparamEditor.java
....@@ -72,7 +72,7 @@
7272
7373 int count = 50;
7474
75
- uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch() / 2) + biparam.minUDivs, biparam.uDivs).getComponent(1);
75
+ uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch()) + biparam.minUDivs, biparam.uDivs).getComponent(1);
7676 vDivsField = (cNumberSlider)AddSlider(uvPanel, "V #", biparam.minVDivs, (int)(count) + biparam.minVDivs, biparam.vDivs).getComponent(1);
7777
7878 oe.ctrlPanel.add(uvPanel);
CameraPane.java
....@@ -2092,12 +2092,12 @@
20922092 if (cameras[i] == null)
20932093 {
20942094 cameras[i] = new Camera(cam.viewCode);
2095
+
2096
+ cameras[i].setAim(cam.location, cam.lookAt);
2097
+ cameras[i].shaper_fovy = cam.shaper_fovy;
2098
+ cameras[i].UP.set(cam.UP);
2099
+ targetLookAts[i] = new cVector(cameras[i].lookAt);
20952100 }
2096
-
2097
- cameras[i].setAim(cam.location, cam.lookAt);
2098
- cameras[i].shaper_fovy = cam.shaper_fovy;
2099
- cameras[i].UP.set(cam.UP);
2100
- targetLookAts[i] = new cVector(cameras[i].lookAt);
21012101 }
21022102 cameracount = 0;
21032103 targetLookAt = targetLookAts[cameracount];
....@@ -8456,7 +8456,7 @@
84568456 {
84578457 // texturecache = textures.get(texname); // suspicious
84588458 if (texturecache == null)
8459
- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8459
+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
84608460 else
84618461 new Exception().printStackTrace();
84628462 } else
Cone.java
....@@ -16,7 +16,7 @@
1616 retile();
1717 base = LA.newVector(0, 0, 0); // -1);
1818 apex = LA.newVector(0, 1, 0); // 1);
19
- baseRadius = apexRadius = 1; // 0.125;
19
+ baseRadius = apexRadius = 0.5; // 0.125;
2020 //fromStandard = new double[4][4];
2121 //toStandard = new double[4][4];
2222 //LA.matIdentity(fromStandard);
....@@ -195,7 +195,7 @@
195195
196196 double uStretch()
197197 {
198
- return 6; // Actually 6.28 (I think)
198
+ return 3; // Actually 3.14 (I think)
199199 }
200200
201201 double vFlip(double v)
Object3D.java
....@@ -3679,6 +3679,7 @@
36793679 if (bRep != null)
36803680 {
36813681 //bRep.RemoveOneTriangle();
3682
+ System.out.println();
36823683 System.out.println("Reducing " + this);
36833684 if (name != null && name.contains("lockpickstraps"))
36843685 name = name;
whitenoise.jpg
Binary files differ