project clean

karimnaaji · Mar 31, 2014 · 031f3ea · 031f3ea
1 parent 6c7345f
commit 031f3ea
Show file tree

Hide file tree

Showing 33 changed files with 14 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,9 @@ cmake_install.cmake
 *.swo
 *.log
 
-build/images/
+build/images/*
+build/linux/
+build/osx/
 
 #os file
 .DS_Store

diff --git a/build/run.sh b/build/run.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# must be ran into osx/ or linux/ folder inside build/
 cmake ../..
 make
 if [[ $? == 0 ]] 
@@ -9,16 +10,16 @@ then
     d=$(($d2-$d1))
     echo "$(($d/60)) minutes and $(($d%60)) seconds elapsed."
 
-	now=`date +"%d%b%Y-%s"`
-	scene=`echo $1 | cut -d'.' -f1`
-	filename="../images/$scene-$now-$2sppx.png"
+    now=`date +"%d%b%Y-%s"`
+    scene=`echo $1 | cut -d'.' -f1`
+    filename="../images/$scene-$now-$2sppx.png"
     convert image.ppm $filename
 
-	echo "filename: $filename"
-	if [[ "$OSTYPE" == "linux-gnu" ]]; then
-		xdg-open $filename
-	elif [[ "$OSTYPE" == "darwin12" ]]; then
-		open $filename
-	fi
-	rm -v image.ppm
+    echo "filename: $filename"
+    if [[ "$OSTYPE" == "linux-gnu" ]]; then
+        xdg-open $filename
+    elif [[ "$OSTYPE" == "darwin12" ]]; then
+        open $filename
+    fi
+    rm -v image.ppm
 fi
diff --git a/src/raytracer/bbox.cpp → src/pathtracer/bbox.cpp b/src/raytracer/bbox.cpp → src/pathtracer/bbox.cpp
diff --git a/src/raytracer/bbox.h → src/pathtracer/bbox.h b/src/raytracer/bbox.h → src/pathtracer/bbox.h
diff --git a/src/raytracer/bvh.cpp → src/pathtracer/bvh.cpp b/src/raytracer/bvh.cpp → src/pathtracer/bvh.cpp
diff --git a/src/raytracer/bvh.h → src/pathtracer/bvh.h b/src/raytracer/bvh.h → src/pathtracer/bvh.h
diff --git a/src/raytracer/camera.cpp → src/pathtracer/camera.cpp b/src/raytracer/camera.cpp → src/pathtracer/camera.cpp
diff --git a/src/raytracer/camera.h → src/pathtracer/camera.h b/src/raytracer/camera.h → src/pathtracer/camera.h
diff --git a/src/raytracer/color.h → src/pathtracer/color.h b/src/raytracer/color.h → src/pathtracer/color.h
diff --git a/src/raytracer/config.h → src/pathtracer/config.h b/src/raytracer/config.h → src/pathtracer/config.h
diff --git a/src/raytracer/helpers.h → src/pathtracer/helpers.h b/src/raytracer/helpers.h → src/pathtracer/helpers.h
diff --git a/src/raytracer/intersection.h → src/pathtracer/intersection.h b/src/raytracer/intersection.h → src/pathtracer/intersection.h
diff --git a/src/raytracer/material.h → src/pathtracer/material.h b/src/raytracer/material.h → src/pathtracer/material.h
diff --git a/src/raytracer/object.h → src/pathtracer/object.h b/src/raytracer/object.h → src/pathtracer/object.h
diff --git a/src/raytracer/objparser.cpp → src/pathtracer/objparser.cpp b/src/raytracer/objparser.cpp → src/pathtracer/objparser.cpp
diff --git a/src/raytracer/objparser.h → src/pathtracer/objparser.h b/src/raytracer/objparser.h → src/pathtracer/objparser.h
diff --git a/src/raytracer/plane.cpp → src/pathtracer/plane.cpp b/src/raytracer/plane.cpp → src/pathtracer/plane.cpp
diff --git a/src/raytracer/plane.h → src/pathtracer/plane.h b/src/raytracer/plane.h → src/pathtracer/plane.h
diff --git a/src/raytracer/ray.h → src/pathtracer/ray.h b/src/raytracer/ray.h → src/pathtracer/ray.h
diff --git a/src/raytracer/renderer.cpp → src/pathtracer/renderer.cpp b/src/raytracer/renderer.cpp → src/pathtracer/renderer.cpp
diff --git a/src/raytracer/renderer.h → src/pathtracer/renderer.h b/src/raytracer/renderer.h → src/pathtracer/renderer.h
diff --git a/src/raytracer/renderingtask.cpp → src/pathtracer/renderingtask.cpp b/src/raytracer/renderingtask.cpp → src/pathtracer/renderingtask.cpp
diff --git a/src/raytracer/renderingtask.h → src/pathtracer/renderingtask.h b/src/raytracer/renderingtask.h → src/pathtracer/renderingtask.h
diff --git a/src/raytracer/scene.cpp → src/pathtracer/scene.cpp b/src/raytracer/scene.cpp → src/pathtracer/scene.cpp
diff --git a/src/raytracer/scene.h → src/pathtracer/scene.h b/src/raytracer/scene.h → src/pathtracer/scene.h
diff --git a/src/raytracer/sceneparser.cpp → src/pathtracer/sceneparser.cpp b/src/raytracer/sceneparser.cpp → src/pathtracer/sceneparser.cpp
diff --git a/src/raytracer/sceneparser.h → src/pathtracer/sceneparser.h b/src/raytracer/sceneparser.h → src/pathtracer/sceneparser.h
diff --git a/src/raytracer/shading.cpp → src/pathtracer/shading.cpp b/src/raytracer/shading.cpp → src/pathtracer/shading.cpp
diff --git a/src/raytracer/shading.h → src/pathtracer/shading.h b/src/raytracer/shading.h → src/pathtracer/shading.h
diff --git a/src/raytracer/sphere.cpp → src/pathtracer/sphere.cpp b/src/raytracer/sphere.cpp → src/pathtracer/sphere.cpp
diff --git a/src/raytracer/sphere.h → src/pathtracer/sphere.h b/src/raytracer/sphere.h → src/pathtracer/sphere.h
diff --git a/src/raytracer/triangle.cpp → src/pathtracer/triangle.cpp b/src/raytracer/triangle.cpp → src/pathtracer/triangle.cpp
diff --git a/src/raytracer/triangle.h → src/pathtracer/triangle.h b/src/raytracer/triangle.h → src/pathtracer/triangle.h