Moving src/ to flatShading/

diegoeche · Oct 16, 2009 · 6db0a4a · 6db0a4a
1 parent 3f9c029
commit 6db0a4a
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 30 deletions.
diff --git a/flatShading/.swp b/flatShading/.swp
diff --git a/src/AST.scala → flatShading/AST.scala b/src/AST.scala → flatShading/AST.scala
diff --git a/src/Group.scala → flatShading/Group.scala b/src/Group.scala → flatShading/Group.scala
diff --git a/src/Hit.scala → flatShading/Hit.scala b/src/Hit.scala → flatShading/Hit.scala
diff --git a/src/Image.scala → flatShading/Image.scala b/src/Image.scala → flatShading/Image.scala
diff --git a/src/Makefile → flatShading/Makefile b/src/Makefile → flatShading/Makefile
diff --git a/src/Object3D.scala → flatShading/Object3D.scala b/src/Object3D.scala → flatShading/Object3D.scala
diff --git a/src/OrtographicCamera.scala → flatShading/OrtographicCamera.scala b/src/OrtographicCamera.scala → flatShading/OrtographicCamera.scala
diff --git a/src/Parser.scala → flatShading/Parser.scala b/src/Parser.scala → flatShading/Parser.scala
@@ -116,8 +116,8 @@ object SceneParser extends StandardTokenParsers {
   def parse(s:String) = {
     val tokens = new lexical.Scanner(s)
     // Check there's only one camera and LightSource.
-    def checkTree (tree:List[SceneObject]) = (tree count (_.isInstanceOf[Camera])) >=0   &&
-                                             (tree count (_.isInstanceOf[LightSource])) >= 0
+    //def checkTree (tree:List[SceneObject]) = (tree count (_.isInstanceOf[Camera])) >=0   &&
+      //                                       (tree count (_.isInstanceOf[LightSource])) >= 0
     // lastFailure = None
     phrase(sceneP)(tokens) match {
       case Success(tree,_) => 

diff --git a/flatShading/README b/flatShading/README
@@ -0,0 +1,19 @@
+-- MIT LICENCE
+-- Small raytracer in Scala. (Flat Shading)
+
+
+
+- Requirements 
+ *Scala 2.8.0
+
+- Install : 
+ "make" will do.
+
+After compiled "scala Main" will write out a file called image.ppm in
+the current directory with the scene declared  in scene.pov
+
+
+Authors:
+
+Diego Echeverri.
+Adolfo Leon Builes.
diff --git a/src/Range.scala → flatShading/Range.scala b/src/Range.scala → flatShading/Range.scala
diff --git a/src/Ray.scala → flatShading/Ray.scala b/src/Ray.scala → flatShading/Ray.scala
diff --git a/src/SceneCreator.scala → flatShading/SceneCreator.scala b/src/SceneCreator.scala → flatShading/SceneCreator.scala
diff --git a/src/TValue.scala → flatShading/TValue.scala b/src/TValue.scala → flatShading/TValue.scala
diff --git a/flatShading/scene.pov b/flatShading/scene.pov
@@ -0,0 +1,15 @@
+
+sphere {
+ <0.5, 0.5, -0.5>,
+  0.3
+  pigment {
+    color Blue
+  }
+}
+sphere {
+  <0.0, 0.0, -0.8>,
+  0.1
+  pigment {
+    color Red
+  }
+}
diff --git a/src/scene.pov b/src/scene.pov