From 9cc83b97378c48bae3792064f2d01b2f954c0e01 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 05 Sep 2019 21:51:51 -0400
Subject: [PATCH] Fix cone.
---
BiparamEditor.java | 2 +-
Cone.java | 4 ++--
whitenoise.jpg | 0
CameraPane.java | 12 ++++++------
Object3D.java | 1 +
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/BiparamEditor.java b/BiparamEditor.java
index 3685e67..5dd1e62 100644
--- a/BiparamEditor.java
+++ b/BiparamEditor.java
@@ -72,7 +72,7 @@
int count = 50;
- uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch() / 2) + biparam.minUDivs, biparam.uDivs).getComponent(1);
+ uDivsField = (cNumberSlider)AddSlider(uvPanel, "U #", biparam.minUDivs, (int)(count*this.biparam.uStretch()) + biparam.minUDivs, biparam.uDivs).getComponent(1);
vDivsField = (cNumberSlider)AddSlider(uvPanel, "V #", biparam.minVDivs, (int)(count) + biparam.minVDivs, biparam.vDivs).getComponent(1);
oe.ctrlPanel.add(uvPanel);
diff --git a/CameraPane.java b/CameraPane.java
index 422bb57..7ca1c65 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -2092,12 +2092,12 @@
if (cameras[i] == null)
{
cameras[i] = new Camera(cam.viewCode);
+
+ cameras[i].setAim(cam.location, cam.lookAt);
+ cameras[i].shaper_fovy = cam.shaper_fovy;
+ cameras[i].UP.set(cam.UP);
+ targetLookAts[i] = new cVector(cameras[i].lookAt);
}
-
- cameras[i].setAim(cam.location, cam.lookAt);
- cameras[i].shaper_fovy = cam.shaper_fovy;
- cameras[i].UP.set(cam.UP);
- targetLookAts[i] = new cVector(cameras[i].lookAt);
}
cameracount = 0;
targetLookAt = targetLookAts[cameracount];
@@ -8456,7 +8456,7 @@
{
// texturecache = textures.get(texname); // suspicious
if (texturecache == null)
- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
else
new Exception().printStackTrace();
} else
diff --git a/Cone.java b/Cone.java
index 1cd10db..490678a 100644
--- a/Cone.java
+++ b/Cone.java
@@ -16,7 +16,7 @@
retile();
base = LA.newVector(0, 0, 0); // -1);
apex = LA.newVector(0, 1, 0); // 1);
- baseRadius = apexRadius = 1; // 0.125;
+ baseRadius = apexRadius = 0.5; // 0.125;
//fromStandard = new double[4][4];
//toStandard = new double[4][4];
//LA.matIdentity(fromStandard);
@@ -195,7 +195,7 @@
double uStretch()
{
- return 6; // Actually 6.28 (I think)
+ return 3; // Actually 3.14 (I think)
}
double vFlip(double v)
diff --git a/Object3D.java b/Object3D.java
index 7209513..2af64dd 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -3679,6 +3679,7 @@
if (bRep != null)
{
//bRep.RemoveOneTriangle();
+ System.out.println();
System.out.println("Reducing " + this);
if (name != null && name.contains("lockpickstraps"))
name = name;
diff --git a/whitenoise.jpg b/whitenoise.jpg
index ee50bf4..c68ff32 100644
--- a/whitenoise.jpg
+++ b/whitenoise.jpg
Binary files differ
--
Gitblit v1.6.2