summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2013-11-29 20:18:33 +0100
committerFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2013-11-29 20:18:33 +0100
commitd5ff8057382a4e1dd2c84fc77b563095b63324ed (patch)
tree687c39da1da95ae7ec23d3756388a4bb66b2827c
parent77943d456f7b06fc87407c7f888dc3a6257be1ae (diff)
download2iv60-robots-d5ff8057382a4e1dd2c84fc77b563095b63324ed.tar.gz
drawRobots method in RobotRace class added. 3 out of 4 materials modified to reflect assignment.
minor changes
-rw-r--r--src/Material.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Material.java b/src/Material.java
index 1968e7f..bf691d2 100644
--- a/src/Material.java
+++ b/src/Material.java
@@ -8,16 +8,16 @@ public enum Material {
* Modify the default values to make it look like gold.
*/
GOLD (
- new float[] {0.8f, 0.8f, 0.8f, 1.0f},
- new float[] {0.0f, 0.0f, 0.0f, 1.0f}),
+ new float[] {0.75f, 0.6f, 0.23f, 1.0f},
+ new float[] {0.63f, 0.56f, 0.37f, 1.0f}),
/**
* Silver material properties.
* Modify the default values to make it look like silver.
*/
SILVER (
- new float[] {0.8f, 0.8f, 0.8f, 1.0f},
- new float[] {0.0f, 0.0f, 0.0f, 1.0f}),
+ new float[] {0.5f, 0.5f, 0.5f, 1.0f},
+ new float[] {0.5f, 0.5f, 0.5f, 1.0f}),
/**
* Wood material properties.
@@ -32,8 +32,8 @@ public enum Material {
* Modify the default values to make it look like orange.
*/
ORANGE (
- new float[] {0.8f, 0.8f, 0.8f, 1.0f},
- new float[] {0.0f, 0.0f, 0.0f, 1.0f});
+ new float[] {0.5f, 0.5f, 0.0f, 1.0f},
+ new float[] {0.6f, 0.6f, 0.5f, 1.0f});
/** The diffuse RGBA reflectance of the material. */
float[] diffuse;