From 0703564f7f2049e2230b8884590a23531f89d72c Mon Sep 17 00:00:00 2001 From: ZhuohaoHe Date: Mon, 26 Aug 2024 11:10:20 -0400 Subject: [PATCH] Update gitignore and grud in header file Signed-off-by: ZhuohaoHe --- .gitignore | 2 +- src/include/config.h | 38 -------------------------------------- src/include/face.hpp | 5 ++++- src/include/material.hpp | 7 +++++-- src/include/math.hpp | 5 ++++- src/include/vertex.hpp | 7 +++++-- 6 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 src/include/config.h diff --git a/.gitignore b/.gitignore index da25727..c52ec00 100755 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ tools/opensbi/build .idea 3rd Doxyfile -include/config.h +src/include/config.h \ No newline at end of file diff --git a/src/include/config.h b/src/include/config.h deleted file mode 100644 index fcc39ed..0000000 --- a/src/include/config.h +++ /dev/null @@ -1,38 +0,0 @@ - -/** - * @file config.h - * @brief 项目配置 - * @author Zone.N (Zone.Niuzh@hotmail.com) - * @version 1.0 - * @date 2023-08-24 - * @copyright MIT LICENSE - * https://github.com/Simple-XX/SimpleRenderer - * @par change log: - * - *
DateAuthorDescription - *
2023-08-24Zone.N创建文件 - *
- */ - -#ifndef SIMPLERENDER_SRC_INCLUDE_CONFIG_H_ -#define SIMPLERENDER_SRC_INCLUDE_CONFIG_H_ - -#include -#include - -namespace simple_renderer { - -/// 线程数 -static constexpr const size_t kNProc = 8; - -/// 日志文件路径 -static const std::string kLogFilePath = - std::string("/Users/hezhohao/Programming/GitRepo/SimpleRenderer/build/bin/logs/SimpleRendererLog.log"); -/// 日志文件大小 -static constexpr const size_t kLogFileMaxSize = 1024*1024*4; -/// 日志文件数量 -static constexpr const size_t kLogFileMaxCount = 8; - -} // namespace simple_renderer - -#endif /* SIMPLERENDER_SRC_INCLUDE_CONFIG_H_ */ diff --git a/src/include/face.hpp b/src/include/face.hpp index 1c0e16f..bd5de4e 100644 --- a/src/include/face.hpp +++ b/src/include/face.hpp @@ -1,4 +1,5 @@ -#pragma once +#ifndef SIMPLERENDER_SRC_INCLUDE_FACE_HPP_ +#define SIMPLERENDER_SRC_INCLUDE_FACE_HPP_ #include @@ -76,3 +77,5 @@ class Face { }; } // namespace simple_renderer + +#endif \ No newline at end of file diff --git a/src/include/material.hpp b/src/include/material.hpp index cc4cece..c637548 100644 --- a/src/include/material.hpp +++ b/src/include/material.hpp @@ -1,4 +1,5 @@ -#pragma once +#ifndef SIMPLERENDER_SRC_INCLUDE_MATERIAL_HPP_ +#define SIMPLERENDER_SRC_INCLUDE_MATERIAL_HPP_ #include @@ -36,4 +37,6 @@ class Material { Vector3f specular; }; -} // namespace simple_renderer \ No newline at end of file +} // namespace simple_renderer + +#endif \ No newline at end of file diff --git a/src/include/math.hpp b/src/include/math.hpp index eb7d3f2..6f5a8eb 100644 --- a/src/include/math.hpp +++ b/src/include/math.hpp @@ -1,4 +1,5 @@ -#pragma once +#ifndef SIMPLERENDER_SRC_INCLUDE_MATH_HPP_ +#define SIMPLERENDER_SRC_INCLUDE_MATH_HPP_ #include @@ -56,3 +57,5 @@ struct fmt::formatter : fmt::formatter { return fmt::format_to(ctx.out(), "\n{}", matrix_str); } }; + +#endif diff --git a/src/include/vertex.hpp b/src/include/vertex.hpp index 1cd3084..924d8fe 100644 --- a/src/include/vertex.hpp +++ b/src/include/vertex.hpp @@ -1,4 +1,5 @@ -#pragma once +#ifndef SIMPLERENDER_SRC_INCLUDE_VERTEX_HPP_ +#define SIMPLERENDER_SRC_INCLUDE_VERTEX_HPP_ #include @@ -63,4 +64,6 @@ class Vertex { Color color_; }; -} // namespace simple_renderer \ No newline at end of file +} // namespace simple_renderer + +#endif \ No newline at end of file