Просмотр исходного кода

Renaming Object to Shape (part 2)

Godzil 4 лет назад
Родитель
Сommit
af96d52c5a
4 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      source/include/shape.h
  2. 1 1
      source/include/sphere.h
  3. 1 1
      source/shapes/shape.cpp
  4. 1 1
      tests/ray_test.cpp

+ 3 - 3
source/include/object.h → 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

+ 1 - 1
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>
 

+ 1 - 1
source/shapes/object.cpp → 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>

+ 1 - 1
tests/ray_test.cpp

@@ -8,7 +8,7 @@
  */
 #include <ray.h>
 #include <transformation.h>
-#include <object.h>
+#include <shape.h>
 #include <gtest/gtest.h>