Skip to content
Browse files

update to match cantor

  • Loading branch information...
1 parent 542a09f commit fe2528bd61f66d4ecd68f0d66b83fc48b3555489 @ztellman committed
Showing with 6 additions and 6 deletions.
  1. BIN penumbra-0.6.0-SNAPSHOT.jar
  2. +6 −6 src/penumbra/opengl/geometry.clj
View
BIN penumbra-0.6.0-SNAPSHOT.jar
Binary file not shown.
View
12 src/penumbra/opengl/geometry.clj
@@ -32,7 +32,7 @@
(defn vertex
"Defines the coordinates for a new vertex."
([v] (if (cartesian? v)
- (condp = (dimension v)
+ (condp = (count v)
2 (vertex (v 0) (v 1))
3 (vertex (v 0) (v 1) (v 2)))
(apply vertex v)))
@@ -43,7 +43,7 @@
(defn texture
"Defines the texture coordinate for subsequent vertices."
([v] (if (cartesian? v)
- (condp = (dimension v)
+ (condp = (count v)
2 (texture (v 0) (v 1))
3 (texture (v 0) (v 1) (v 2)))
(if (number? v)
@@ -55,7 +55,7 @@
(defn normal
"Defines the normal vector for subsequent vertices."
([v] (if (cartesian? v)
- (condp = (dimension v)
+ (condp = (count v)
2 (normal (v 0) (v 1) 0)
3 (normal (v 0) (v 1) (v 2)))
(apply normal v)))
@@ -64,7 +64,7 @@
(defn translate
"Translates the position of subsequent vertices."
([v] (if (cartesian? v)
- (condp = (dimension v)
+ (condp = (count v)
2 (translate (v 0) (v 1))
3 (translate (v 0) (v 1) (v 2)))
(apply translate v)))
@@ -74,7 +74,7 @@
(defn scale
"Scales the position of subsequent vertices."
([v] (if (cartesian? v)
- (condp = (dimension v)
+ (condp = (count v)
2 (scale (v 0) (v 1))
3 (scale (v 0) (v 1) (v 2)))
(apply scale v)))
@@ -254,4 +254,4 @@
(finally
(gl-end)))))))
-;;;
+;;;

0 comments on commit fe2528b

Please sign in to comment.
Something went wrong with that request. Please try again.