Merge branch 'master' into 1.7

#447 Invisible rendering.
This commit is contained in:
cp committed 2014-03-19 15:55:50 +08:00
commit 15a723bcec
4 files changed
+583 -124

No files matched your search

@@ -32,6 +32,18 @@ public class Vertex {
this.uv = new Vector2f(uv);
}
public Vertex(double x, double y, double z, double u, double v, int brightness, float r, float g, float b, float a) {
xyz.set(x, y, z);
uv = new Vector2f(u, v);
this.brightness = brightness;
color = new Vector4f(r, g, b, a);
}
public Vertex(double x, double y, double z, double u, double v) {
xyz.set(x, y, z);
uv = new Vector2f(u, v);
}
public void setXYZ(double x, double y, double z) {
xyz.set(x, y, z);
}