summaryrefslogtreecommitdiff
path: root/src/common/CollidableObject.java
diff options
context:
space:
mode:
authorPhillip <pacardon@u.washington.edu>2011-03-08 00:53:34 +0000
committerPhillip <pacardon@u.washington.edu>2011-03-08 00:53:34 +0000
commit6399678d37243d0ee770dda231b1be6b71f22ec5 (patch)
tree41160023cbd02d7f0408495b30d098c088f93756 /src/common/CollidableObject.java
parent47b4b9143bf45e7949d9b01751969d0f8780e004 (diff)
Diffstat (limited to 'src/common/CollidableObject.java')
-rw-r--r--src/common/CollidableObject.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/CollidableObject.java b/src/common/CollidableObject.java
index e4a1119..0549335 100644
--- a/src/common/CollidableObject.java
+++ b/src/common/CollidableObject.java
@@ -584,12 +584,15 @@ public abstract class CollidableObject implements Serializable {
if (in.readBoolean()) {
Material material = new Material();
material.setAmbientColor((Color3f)in.readObject());
- material.setDiffuseColor((Color3f)in.readObject());
+ Color3f color = (Color3f)in.readObject();
+ material.setDiffuseColor(color);
material.setSpecularColor((Color3f)in.readObject());
material.setEmissiveColor((Color3f)in.readObject());
material.setShininess(in.readFloat());
material.setColorTarget(in.readInt());
appearance.setMaterial(material);
+ appearance.setColoringAttributes(new ColoringAttributes(color,
+ ColoringAttributes.FASTEST));
}
return appearance;
}