diff --git a/doc/common/style.css b/doc/common/style.css index fb9f4788..872a8d28 100644 --- a/doc/common/style.css +++ b/doc/common/style.css @@ -12,6 +12,12 @@ table margin-right:auto; } +ul +{ + padding:0px; + margin:0px; +} + table.principale { background-color:#ff8000; @@ -200,3 +206,99 @@ div.issue-title { font-weight:bold; } + +span.progword +{ + color:#000000; + font-family:"Courier New"; + font-size:11px; +} + +span.bold +{ + font-weight:bold; +} + +span.code-title +{ + padding-left:0px; + color:#803300; +} + +span.code-line-content +{ + display:inline; + color:#000000; + border-left-style:solid; + border-left-width:1px; + border-left-color:#ffdac1; + margin-left:0px; + padding-left:8px; +} + +ul.code-list +{ + border-style:solid; + border-width:1px; + border-color:#ffdac1; + color:#803300; + margin-bottom:16px; + margin-left:0px; + margin-right:0px; +} + +li.code-line +{ + color:#008080; + font-family:"Courier New"; + font-size:11px; + clear:both; + width:100%; + list-style-position:inside; + list-style-type:decimal-leading-zero; + margin:0px; + padding:0px; + padding-left:0px; +} + +li.code-line:after +{ + clear:both; +} + +span.code-line-content +{ + display:inline; + color:#000000; + border-left-style:solid; + border-left-width:1px; + border-left-color:#ffdac1; + margin-left:0px; + padding-left:8px; +} + +span.userword +{ + color:#ff8000; +} + +span.keyword +{ + color:#0000ff; +} + +span.comment +{ + color:#008000; +} + +span.string +{ + color:#800000; +} + +span.codeword +{ + color:#000000; + font-family:"Courier New"; +} diff --git a/doc/src/code.xsl b/doc/src/code.xsl index 73a90189..f9650409 100644 --- a/doc/src/code.xsl +++ b/doc/src/code.xsl @@ -35,19 +35,6 @@ - -
-
- | -
-
- -
-
_________________
-
-
- - @@ -2172,7 +2577,7 @@ This page contains OpenGL 2.0 specifications. - + This page contains OpenGL Shading Language Specification. diff --git a/doc/src/dummy.cpp b/doc/src/dummy.cpp index 0395e23b..7188c829 100644 --- a/doc/src/dummy.cpp +++ b/doc/src/dummy.cpp @@ -1,4 +1,42 @@ +#include "../../glm/glm.hpp" // glm::vec3, glm::vec4, glm::ivec4, glm::mat4 + +struct triangle +{ + glm::vec3 Position[3]; + glm::vec3 Normal; +}; + +void computeNormal(triangle & Triangle) +{ + glm::vec3 const & a = Triangle.Position[0]; + glm::vec3 const & b = Triangle.Position[1]; + glm::vec3 const & c = Triangle.Position[2]; + Triangle.Normal = glm::normalize(glm::cross(c - a, b - a)); +} + +#include "../../glm/gtc/matrix_projection.hpp" // glm::perspective +#include "../../glm/gtc/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale +#include "../../glm/gtc/type_ptr.hpp" // glm::value_ptr + +glm::vec4 const ClearColor = glm::vec4(glm::vec3(0.0f), 1.0f); +glm::ivec4 const Viewport = glm::ivec4(0, 0, 640, 480); + +void glUniformMatrix4fv(int location, int count, bool transpose, const float * value); + int main() { + //triangle Triangle; + //computeNormal(Triangle); + float Translate = 1.0f; + glm::vec2 Rotate; + + glm::mat4 Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.f); + glm::mat4 ViewTranslate = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -Translate)); + glm::mat4 ViewRotateX = glm::rotate(ViewTranslate, Rotate.y, glm::vec3(-1.0f, 0.0f, 0.0f)); + glm::mat4 View = glm::rotate(ViewRotateX, Rotate.x, glm::vec3(0.0f, 1.0f, 0.0f)); + glm::mat4 Model = glm::scale(glm::mat4(1.0f), glm::vec3(0.5f)); + glm::mat4 MVP = Projection * View * Model; + + glUniformMatrix4fv(LocationMVP, 1, GL_FALSE, glm::value_ptr(MVP)); } diff --git a/doc/src/news.xsl b/doc/src/news.xsl index 7f85a416..bc888916 100644 --- a/doc/src/news.xsl +++ b/doc/src/news.xsl @@ -53,24 +53,12 @@ + + + - +
_________________
diff --git a/doc/src/util.xsl b/doc/src/util.xsl index 55e49061..0d9be52a 100644 --- a/doc/src/util.xsl +++ b/doc/src/util.xsl @@ -1,140 +1,224 @@ - + - + - - - + + + - - - - - menu-titre2 - + + + + + menu-titre2 + + + + + + + + - - - - - - - - - - + + + - -
- -
- + +
+ +
+ - - - {./@title} - - + + + {./@title} + + - -
- -
- + +
+ +
+ - -
- + +
+ - -

- + +

+ - -
- -
-
- - - - :
- + +
+ +
+
+ + + + :
+ - -
-
-
- - GLM Logo - -
-
- -
-
- -
- -
- - + +
+
+
+ + GLM Logo + +
+
+ +
+
+ +
+ +
+ + - -
- - {@name} - -
- + +
+ + {@name} + +
+ - - - - - -
- - G-Truc - -
- - - - -
- + + + + + +
+ + G-Truc + +
+ + + + +
+ - -
- - - -
- + +
+ + + +
+ + + + + + + + + + + + + + + + +
    + +
+ + + +
  • + + + + + + + + + + + + +
    • +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +