summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2014-01-15 03:08:24 +0100
committerFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2014-01-15 03:08:24 +0100
commit7b76e9085081fe2b9e82b677c263e11efdb08871 (patch)
tree821c75404ac8140efb26b1e055943415070d5904
parent733d35194cd41b898c8a8439d4b203413a0a72b5 (diff)
download2iv60-robots-7b76e9085081fe2b9e82b677c263e11efdb08871.tar.gz
Third primitive (assignment) for tree, small fix for terrain
-rw-r--r--src/Terrain.java1
-rw-r--r--src/Tree.java5
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Terrain.java b/src/Terrain.java
index 403baca..cbd29d4 100644
--- a/src/Terrain.java
+++ b/src/Terrain.java
@@ -228,7 +228,6 @@ class Terrain extends BetterBase {
terrainTrees[i] = new Tree(this, treePosition,
scale, variation);
- System.out.println(i);
}
}
diff --git a/src/Tree.java b/src/Tree.java
index 7eeabfb..a773b9b 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -126,9 +126,12 @@ public class Tree extends BetterBase {
} else {
// Draw the normal spherish tree
float radius = treeTrunkRadius * 4.5f;
- setColor(new Color(32, 84, 10));
+ setColor(new Color(20, 51, 6));
gl.glTranslatef(0, 0, totalHeight - (radius / 2));
glut.glutSolidSphere(radius, 6, 6);
+ setColor(new Color(27, 70, 9));
+ gl.glTranslatef(0, 0, radius);
+ glut.glutSolidSphere(radius / 1.25f, 6, 6);
}
}