Made shape protected

Fixed bug in extruded

diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
index 36d95ff911ec1d89d792dda2fb88f0cd12da41c6..e934c1a0df573b871778be2324a82a110139d572 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
@@ -35,7 +35,7 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
                }\r
        };\r
 \r
-       BurningShape xsection = new BurningShape();\r
+       protected BurningShape xsection = new BurningShape();\r
 \r
        Amount<Length> length = Amount.valueOf(25, SI.MILLIMETER);\r
        \r
@@ -48,7 +48,7 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
        public Amount<Area> surfaceArea(Amount<Length> regression) {\r
                Amount<Area> zero = Amount.valueOf(0, Area.UNIT);\r
                \r
-               if (regression.isGreaterThan(webThickness))\r
+               if (regression.isGreaterThan(webThickness()))\r
                        return zero;\r
                \r
                Amount<Length> rLen = length;\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
index b6f8f85c51f7becb665fb99fd6f03b14d49f46f8..0e450600034dec33e3836521dcc4703fd55d6600 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
@@ -30,8 +30,8 @@ public class RotatedShapeGrain implements Grain {
                                Shape outside = new Rectangle2D.Double(0,0,15,70);\r
                                shape.add( outside );\r
                                shape.inhibit( outside );\r
-                               shape.subtract( new Rectangle2D.Double(0,50,5,70));\r
-                               //shape.subtract(new Rectangle2D.Double(0, -10, 15, 10));\r
+                               shape.subtract( new Rectangle2D.Double(0,0,5,70));\r
+                               shape.subtract(new Rectangle2D.Double(0, -10, 15, 10));\r
                                shape.subtract(new Rectangle2D.Double(0, 70, 15, 10));\r
                        } catch ( Exception e ){\r
                                throw new Error(e);\r
@@ -39,6 +39,8 @@ public class RotatedShapeGrain implements Grain {
                }\r
        };\r
        \r
+\r
+       \r
        public enum Quality {\r
                High()\r
                        {{\r
@@ -62,7 +64,7 @@ public class RotatedShapeGrain implements Grain {
        \r
        Quality quality = Quality.Low;\r
        \r
-       BurningShape shape = new BurningShape();\r
+       protected BurningShape shape = new BurningShape();\r
        \r
        Amount<Length> web = null;\r
        \r