From af96d52c5ae4e972512c9bc14908404b97ad551d Mon Sep 17 00:00:00 2001
From: Godzil <godzil@godzil.net>
Date: Tue, 18 Feb 2020 11:43:05 +0000
Subject: [PATCH] Renaming Object to Shape (part 2)

---
 source/include/{object.h => shape.h}    | 6 +++---
 source/include/sphere.h                 | 2 +-
 source/shapes/{object.cpp => shape.cpp} | 2 +-
 tests/ray_test.cpp                      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename source/include/{object.h => shape.h} (92%)
 rename source/shapes/{object.cpp => shape.cpp} (96%)

diff --git a/source/include/object.h b/source/include/shape.h
similarity index 92%
rename from source/include/object.h
rename to source/include/shape.h
index 8d5b39c..8ad3fa1 100644
--- a/source/include/object.h
+++ b/source/include/shape.h
@@ -6,8 +6,8 @@
  *  Copyright (c) 2020 986-Studio.
  *
  */
-#ifndef DORAYME_OBJECT_H
-#define DORAYME_OBJECT_H
+#ifndef DORAYME_SHAPE_H
+#define DORAYME_SHAPE_H
 
 class Shape;
 
@@ -37,4 +37,4 @@ public:
     Ray invTransform(Ray r) {  return Ray(this->inverseTransform * r.origin, this->inverseTransform * r.direction); };
 };
 
-#endif //DORAYME_OBJECT_H
+#endif //DORAYME_SHAPE_H
diff --git a/source/include/sphere.h b/source/include/sphere.h
index 66a8313..a1d4ccc 100644
--- a/source/include/sphere.h
+++ b/source/include/sphere.h
@@ -9,7 +9,7 @@
 #ifndef DORAYME_SPHERE_H
 #define DORAYME_SPHERE_H
 
-#include <object.h>
+#include <shape.h>
 #include <ray.h>
 #include <intersect.h>
 
diff --git a/source/shapes/object.cpp b/source/shapes/shape.cpp
similarity index 96%
rename from source/shapes/object.cpp
rename to source/shapes/shape.cpp
index 1d4427d..078e11d 100644
--- a/source/shapes/object.cpp
+++ b/source/shapes/shape.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <ray.h>
-#include <object.h>
+#include <shape.h>
 #include <matrix.h>
 #include <tuple.h>
 #include <intersect.h>
diff --git a/tests/ray_test.cpp b/tests/ray_test.cpp
index d2ea997..2b94f9b 100644
--- a/tests/ray_test.cpp
+++ b/tests/ray_test.cpp
@@ -8,7 +8,7 @@
  */
 #include <ray.h>
 #include <transformation.h>
-#include <object.h>
+#include <shape.h>
 #include <gtest/gtest.h>