 		set: (value) -> @_scaleX = @_scaleY = value
 
 
-	@define "rotateX",
-		get: -> @_rotateX or 0
-		set: (value) -> @_rotateX = value
+	@define "rotationX",
+		get: -> @_rotationX or 0
+		set: (value) -> @_rotationX = value
 	
-	@define "rotateY",
-		get: -> @_rotateY or 0
+	@define "rotationY",
+		get: -> @_rotationY or 0
 		set: (value) ->
-			@_rotateY = value
+			@_rotationY = value
 	
-	@define "rotateZ",
-		get: -> @_rotateZ or 0
+	@define "rotationZ",
+		get: -> @_rotationZ or 0
 		set: (value) -> 
-			@_rotateZ = value
+			@_rotationZ = value
 	
-	@define "rotate",
-		get: -> @rotateZ
+	@define "rotation",
+		get: -> @rotationZ
 		set: (value) -> 
-			@rotateZ = value
+			@rotationZ = value
 
 	decompose: (m) ->
 		

		@scaleY = v.scale.y
		@scaleZ = v.scale.z
		
		@rotateX = v.rotation.x / Math.PI * 180
		@rotateY = v.rotation.y / Math.PI * 180
		@rotateZ = v.rotation.z / Math.PI * 180
		
	
	matrix: ->
		m = new WebKitCSSMatrix()
		m = m.translate @_x, @_y, @_z
		# m = m.rotate @_rotateX, @_rotateY, @_rotateZ
		m = m.rotate @_rotateX, 0, 0
		m = m.rotate 0, @_rotateY, 0
		m = m.rotate 0, 0, @_rotateZ
		m = m.scale @scaleX, @scaleY, @scaleZ
		
		return m

		# result =
		# 	translation: d.translate
		# 	scale: d.scale
		# 	rotation: d.rotation
		# 
		# return result
		
