X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fmodel.cpp;h=8e3417b1656dc984e0c7ff8cd709cc98e9355dc7;hb=HEAD;hp=9a8554b8dfa0494194c782cffcaf89a07e379c92;hpb=526db67540bf69a4c09ed0d0f4d62bad0a37ee70;p=lsystem3d.git

diff --git a/src/model.cpp b/src/model.cpp
index 9a8554b..8e3417b 100644
--- a/src/model.cpp
+++ b/src/model.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2006 Erik Dahlberg
 // 
-// This file is part of LSystem3d.
+// This file is part of LSystem3D.
 // 
 // LSystem3D is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -28,6 +28,8 @@
 #include "model.h"
 #include "vector.h"
 
+using namespace std;
+
 
 
 /**
@@ -57,6 +59,32 @@ Model::~Model()
 
 
 
+/**
+ * Clear the model
+ */
+void Model::clear()
+{
+    glDeleteLists(_displayList, 1);
+    _displayList = glGenLists(1);
+    
+    setColorIndex(0);
+    
+    _diameter = 0.1;
+    _diameterFactor = 0.8;
+}
+
+
+
+/**
+ * Render to screen
+ */
+void Model::draw()
+{
+    glCallList(_displayList);
+}
+
+
+
 /**
  * Create a segment
  * @param x1 x start point
@@ -123,32 +151,6 @@ void Model::normal(double x, double y, double z)
 
 
 
-/**
- * Render to screen
- */
-void Model::draw()
-{
-    glCallList(_displayList);
-}
-
-
-
-/**
- * Clear the model
- */
-void Model::clear()
-{
-    glDeleteLists(_displayList, 1);
-    _displayList = glGenLists(1);
-    
-    setColorIndex(0);
-    
-    _diameter = 0.1;
-    _diameterFactor = 0.8;
-}
-
-
-
 /**
  * Begin a modelling session
  */
@@ -214,7 +216,7 @@ void Model::prevColor()
 
 
 /**
- * Decrement diameter of segment
+ * Decrement segment diameter
  */
 void Model::decrementDiameter()
 {
@@ -258,7 +260,7 @@ void Model::setColorIndex(int index)
 
 
 /**
- * Set current diameter of segment
+ * Set current segment diameter
  * @param diameter the diameter
  */
 void Model::setDiameter(double diameter)
@@ -269,7 +271,7 @@ void Model::setDiameter(double diameter)
 
 
 /**
- * Set diameter factor
+ * Set segment diameter factor
  * @param diameter the diameter factor
  */
 void Model::setDiameterFactor(double diameterFactor)
@@ -291,10 +293,21 @@ int Model::getColorIndex()
 
 
 /**
- * Get current diameter of segment
- * @return diameter of segment
+ * Get current segment diameter
+ * @return the diameter
  */
 double Model::getDiameter()
 {
     return _diameter;
 }
+
+
+
+/**
+ * Get segment diameter factor
+ * @return the diameter factor
+ */
+double Model::getDiameterFactor()
+{
+    return _diameterFactor;
+}