From be5d48d2eaed3af76f03297e376f7a67e8a8238f Mon Sep 17 00:00:00 2001 From: TravisBot <> Date: Wed, 20 Dec 2017 18:02:11 +0000 Subject: Rebuilding documentation --- glslprogram_8h_source.html | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'glslprogram_8h_source.html') diff --git a/glslprogram_8h_source.html b/glslprogram_8h_source.html index ef92d0bb..ec0e5f6d 100644 --- a/glslprogram_8h_source.html +++ b/glslprogram_8h_source.html @@ -30,7 +30,7 @@
YAGE -  v0.3.1 +  v0.1.3
Yet Another Game Engine
@@ -108,14 +108,7 @@ $(document).ready(function(){initNavTree('glslprogram_8h_source.html','');});
glslprogram.h
-Go to the documentation of this file.
1 /* ----------------------------------------------------------------------------
-
2  * glslprogram.h
-
3  *
-
4  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
-
5  * MIT License, see LICENSE file for more details.
-
6  * ----------------------------------------------------------------------------
-
7  */
-
8 
+Go to the documentation of this file.
1 
9 #ifndef GLSL_PROGRAM_H
10 #define GLSL_PROGRAM_H
11 
@@ -137,51 +130,58 @@ $(document).ready(function(){initNavTree('glslprogram_8h_source.html','');});
27  GlslProgram &operator=(const GlslProgram &) = delete;
28  GlslProgram &operator=(GlslProgram &&) = delete;
29 
-
31  void compileShaders(const std::string &vertex_shader_path,
-
32  const std::string &fragment_shader_path);
-
33  void linkShaders();
-
34  void addAttribute(const std::string &attribute_name);
-
35  GLint getUniformLocation(const std::string &uniform_name);
-
36  void use();
-
37  void unuse();
-
38 
-
39  void defaultSetup();
+
31  void compileShaders(const std::string &vertexShader,
+
32  const std::string fragmentShader);
+
33  void compileShadersFromFile(const std::string &vertex_shader_path,
+
34  const std::string &fragment_shader_path);
+
35  void linkShaders();
+
36  void addAttribute(const std::string &attribute_name);
+
37  GLint getUniformLocation(const std::string &uniform_name);
+
38  void use();
+
39  void unuse();
40 
-
41 private:
-
43  GLuint program_id_ = 0;
-
44  GLuint vertex_shader_id_ = 0;
-
45  GLuint fragment_shader_id_ = 0;
-
46  int attribute_index_ = 0;
-
47 
-
49  void compileShader(const GLuint &shader, const std::string &file_path);
-
50 };
-
51 
-
52 } // namespace yage
-
53 
-
54 #endif
-
yage::GlslProgram::unuse
void unuse()
Definition: glslprogram.cpp:154
-
yage::GlslProgram::attribute_index_
int attribute_index_
Definition: glslprogram.h:46
+
41  void defaultSetup();
+
42 
+
43 private:
+
45  GLuint program_id_ = 0;
+
46  GLuint vertex_shader_id_ = 0;
+
47  GLuint fragment_shader_id_ = 0;
+
48  int attribute_index_ = 0;
+
49 
+
51  void compileShader(GLuint shader, const std::string &shaderContent);
+
52  void compileShaderFromFile(GLuint shader, const std::string &file_path);
+
53  void initShaderId();
+
54 };
+
55 
+
56 } // namespace yage
+
57 
+
58 #endif
+
yage::GlslProgram::compileShaders
void compileShaders(const std::string &vertexShader, const std::string fragmentShader)
compiles vertex and fragment shader
Definition: glslprogram.cpp:104
+
yage::GlslProgram::unuse
void unuse()
Definition: glslprogram.cpp:180
+
yage::GlslProgram::attribute_index_
int attribute_index_
Definition: glslprogram.h:48
+
yage::GlslProgram::compileShadersFromFile
void compileShadersFromFile(const std::string &vertex_shader_path, const std::string &fragment_shader_path)
Definition: glslprogram.cpp:113
yage::GlslProgram
Definition: glslprogram.h:19
-
yage::GlslProgram::compileShaders
void compileShaders(const std::string &vertex_shader_path, const std::string &fragment_shader_path)
compiles vertex and fragment shader
Definition: glslprogram.cpp:75
+
yage::GlslProgram::compileShaderFromFile
void compileShaderFromFile(GLuint shader, const std::string &file_path)
Definition: glslprogram.cpp:66
+
yage::GlslProgram::initShaderId
void initShaderId()
Definition: glslprogram.cpp:86
yage::GlslProgram::~GlslProgram
~GlslProgram()
Definition: glslprogram.cpp:18
yage::GlslProgram::GlslProgram
GlslProgram()=default
-
yage::GlslProgram::program_id_
GLuint program_id_
compiled shader program id
Definition: glslprogram.h:43
-
yage::GlslProgram::defaultSetup
void defaultSetup()
Definition: glslprogram.cpp:162
-
yage::GlslProgram::linkShaders
void linkShaders()
Definition: glslprogram.cpp:98
-
yage::GlslProgram::fragment_shader_id_
GLuint fragment_shader_id_
Definition: glslprogram.h:45
-
yage::GlslProgram::addAttribute
void addAttribute(const std::string &attribute_name)
Definition: glslprogram.cpp:131
-
yage::GlslProgram::compileShader
void compileShader(const GLuint &shader, const std::string &file_path)
compiles one shader
Definition: glslprogram.cpp:34
-
yage::GlslProgram::use
void use()
Definition: glslprogram.cpp:146
-
yage::GlslProgram::vertex_shader_id_
GLuint vertex_shader_id_
Definition: glslprogram.h:44
+
yage::GlslProgram::compileShader
void compileShader(GLuint shader, const std::string &shaderContent)
compiles one shader
Definition: glslprogram.cpp:34
+
yage::GlslProgram::program_id_
GLuint program_id_
compiled shader program id
Definition: glslprogram.h:45
+
yage::GlslProgram::defaultSetup
void defaultSetup()
Definition: glslprogram.cpp:188
+
yage::GlslProgram::linkShaders
void linkShaders()
Definition: glslprogram.cpp:124
+
yage::GlslProgram::fragment_shader_id_
GLuint fragment_shader_id_
Definition: glslprogram.h:47
+
yage::GlslProgram::addAttribute
void addAttribute(const std::string &attribute_name)
Definition: glslprogram.cpp:157
+
yage::GlslProgram::use
void use()
Definition: glslprogram.cpp:172
+
yage::GlslProgram::vertex_shader_id_
GLuint vertex_shader_id_
Definition: glslprogram.h:46
yage::GlslProgram::operator=
GlslProgram & operator=(const GlslProgram &)=delete
-
yage::GlslProgram::getUniformLocation
GLint getUniformLocation(const std::string &uniform_name)
Definition: glslprogram.cpp:137
+
yage::GlslProgram::getUniformLocation
GLint getUniformLocation(const std::string &uniform_name)
Definition: glslprogram.cpp:163