diff options
| author | chai <chaifix@163.com> | 2018-10-20 15:50:06 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-20 15:50:06 +0800 |
| commit | e9410bd371fc68169c57d2c52382948a0b083da4 (patch) | |
| tree | d8f7e600b4ffd6a5c4c9a30f68f9ee74b8491c3b /src/libjin/Graphics/Shader | |
| parent | 58ad98213763348b49d8313675203b287a5442bb (diff) | |
*修改名称空间
Diffstat (limited to 'src/libjin/Graphics/Shader')
| -rw-r--r-- | src/libjin/Graphics/Shader/je_shader.cpp | 12 | ||||
| -rw-r--r-- | src/libjin/Graphics/Shader/je_shader.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp index 686f2b9..19485b9 100644 --- a/src/libjin/Graphics/Shader/je_shader.cpp +++ b/src/libjin/Graphics/Shader/je_shader.cpp @@ -9,12 +9,12 @@ #include "je_shader.h" -namespace jin +namespace JinEngine { - namespace graphics + namespace Graphics { - using namespace jin::filesystem; + using namespace JinEngine::Filesystem; using namespace std; // @@ -258,7 +258,7 @@ namespace jin ); } - void Shader::sendMatrix4(const char* name, const math::Matrix* mat4) + void Shader::sendMatrix4(const char* name, const Math::Matrix* mat4) { int loc = glGetUniformLocation(mPID, name); glUniformMatrix4fv(loc, 1, GL_FALSE, mat4->getElements()); @@ -278,7 +278,7 @@ namespace jin glVertexAttribPointer(loc, n, type, GL_FALSE, stride, pointers); } - } // namespace graphics -} // namespace jin + } // namespace Graphics +} // namespace JinEngine #endif // jin_graphics_shader
\ No newline at end of file diff --git a/src/libjin/Graphics/Shader/je_shader.h b/src/libjin/Graphics/Shader/je_shader.h index 5145f85..69746de 100644 --- a/src/libjin/Graphics/Shader/je_shader.h +++ b/src/libjin/Graphics/Shader/je_shader.h @@ -15,9 +15,9 @@ #include "je_base.shader.h" -namespace jin +namespace JinEngine { - namespace graphics + namespace Graphics { /// @@ -135,7 +135,7 @@ namespace jin /// @param name Name of the uniform variable to be assigned. /// @param mat4 Matrix to be sent. /// - void sendMatrix4(const char* name, const math::Matrix* mat4); + void sendMatrix4(const char* name, const Math::Matrix* mat4); /// /// Set vertices value. @@ -192,8 +192,8 @@ namespace jin }; - } // namespace graphics -} // namespace jin + } // namespace Graphics +} // namespace JinEngine #endif // jin_graphics && jin_graphics_shader |