Browse Source

Getting GLM 0.9.3.0 release ready

Christophe Riccio 14 năm trước cách đây
mục cha
commit
6de0628bc9
5 tập tin đã thay đổi với 40 bổ sung18 xóa
  1. 3 3
      doc/download.html
  2. BIN
      doc/glm-0.9.3.pdf
  3. BIN
      doc/image/0075-1.jpg
  4. 22 6
      doc/index.html
  5. 15 9
      doc/src/data.xml

+ 3 - 3
doc/download.html

@@ -12,10 +12,10 @@
           var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
           })();
         </script></head><body><table><tr><td class="menu"><div class="menu1"><br /><div><a href="./goodies/logo1920x1200.png"><img class="menu-img" src="./common/logo.png" alt="GLM Logo" /></a></div><br /><div><a class="menu" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download">
-			Download GLM 0.9.3.0</a></div></div><br /><div class="menu2"><a href="./index.html">Front page</a></div><div class="menu2"><a href="./download.html">Downloads</a></div><div class="menu2"><a href="http://www.opengl.org/sdk/libs/GLM/">OpenGL SDK page</a></div><br /><div class="menu2"><a href="./glm.pdf">GLM Manual</a></div><div class="menu2"><a href="./api/index.html">GLM API</a></div><div class="menu2"><a href="./code.html">Code samples</a></div><div class="menu2"><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.10.6.clean.pdf">GLSL Specification</a></div><div class="menu2"><a href="http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=postlist&amp;Board=10&amp;page=1">OpenGL.org Toolkits forum</a></div><br /><div class="menu2"><a href="https://sourceforge.net/apps/trac/ogl-math/newticket">Report a bug</a></div><div class="menu2"><a href="https://sourceforge.net/projects/ogl-math/">SourceForge page</a></div><div class="menu2"><a href="http://www.g-truc.net/project-0016.html#menu">G-Truc Creation page</a></div><div class="menu2"><a href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=summary">Browse Git repository</a></div><div class="menu2"><a href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=snapshot;h=HEAD;sf=tgz">Source snapshot</a></div><br /><br /><div class="menu2"><a href="http://www.g-truc.net"><img class="menu-img" src="./common/g-truc.png" alt="G-Truc" /></a></div><br /></td><td class="page"><div class="title1"><img src="./common/title.png" alt="OpenGL Mathematics" /></div><div class="title3">GLSL + Optional features = OpenGL Mathematics (GLM)<br />A C++ mathematics library for graphics programming<br /></div><br /><br /><div><div class="title4">Current release</div></div><div class="issue-content">08/01/2012:
+			Download GLM 0.9.3.0</a></div></div><br /><div class="menu2"><a href="./index.html">Front page</a></div><div class="menu2"><a href="./download.html">Downloads</a></div><div class="menu2"><a href="http://www.opengl.org/sdk/libs/GLM/">OpenGL SDK page</a></div><br /><div class="menu2"><a href="./glm.pdf">GLM Manual</a></div><div class="menu2"><a href="./api/index.html">GLM API</a></div><div class="menu2"><a href="./code.html">Code samples</a></div><div class="menu2"><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.10.6.clean.pdf">GLSL Specification</a></div><div class="menu2"><a href="http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=postlist&amp;Board=10&amp;page=1">OpenGL.org Toolkits forum</a></div><br /><div class="menu2"><a href="https://sourceforge.net/apps/trac/ogl-math/newticket">Report a bug</a></div><div class="menu2"><a href="https://sourceforge.net/projects/ogl-math/">SourceForge page</a></div><div class="menu2"><a href="http://www.g-truc.net/project-0016.html#menu">G-Truc Creation page</a></div><div class="menu2"><a href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=summary">Browse Git repository</a></div><div class="menu2"><a href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=snapshot;h=HEAD;sf=tgz">Source snapshot</a></div><br /><br /><div class="menu2"><a href="http://www.g-truc.net"><img class="menu-img" src="./common/g-truc.png" alt="G-Truc" /></a></div><br /></td><td class="page"><div class="title1"><img src="./common/title.png" alt="OpenGL Mathematics" /></div><div class="title3">GLSL + Optional features = OpenGL Mathematics (GLM)<br />A C++ mathematics library for graphics programming<br /></div><br /><br /><div><div class="title4">Current release</div></div><div class="issue-content">09/01/2012:
                 <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download">GLM 0.9.3.0</a>
                 (4.3 MB)
-              </div><div class="news-separator">_________________</div><br /><div><div class="title4">GLM - zip files</div><div class="issue-content">08/01/2012: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download">GLM 0.9.3.0</a> (4.3 MB)
+              </div><div class="news-separator">_________________</div><br /><div><div class="title4">GLM - zip files</div><div class="issue-content">09/01/2012: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download">GLM 0.9.3.0</a> (4.3 MB)
     </div><div class="issue-content">12/12/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.B/glm-0.9.3.B.zip/download">GLM 0.9.3.B</a> (4.3 MB)
     </div><div class="issue-content">11/11/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.A/glm-0.9.3.A.zip/download">GLM 0.9.3.A</a> (4.3 MB)
     </div><div class="issue-content">24/10/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.2.7/glm-0.9.2.7.zip/download">GLM 0.9.2.7</a> (3.4 MB)
@@ -83,7 +83,7 @@
     </div><div class="issue-content">02/19/2006: <a href="http://prdownloads.sourceforge.net/glf/glm-0.3.zip?download">GLM 0.3.0.0</a> (945 KB)
     </div><div class="issue-content">05/05/2005: <a href="http://prdownloads.sourceforge.net/glf/glm-0.2.zip?download">GLM 0.2.0.0</a> (194 KB)
     </div><div class="issue-content">02/21/2005: <a href="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download">GLM 0.1.0.0</a> (29.2 KB)
-    </div></div><div class="news-separator">_________________</div><br /><div><div class="title4">GLM - 7z files</div><div class="issue-content">08/01/2012: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.7z/download">GLM 0.9.3.0</a> (2.8 MB)
+    </div></div><div class="news-separator">_________________</div><br /><div><div class="title4">GLM - 7z files</div><div class="issue-content">09/01/2012: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.7z/download">GLM 0.9.3.0</a> (2.8 MB)
     </div><div class="issue-content">12/12/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.B/glm-0.9.3.B.7z/download">GLM 0.9.3.B</a> (2.8 MB)
     </div><div class="issue-content">11/11/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.A/glm-0.9.3.A.7z/download">GLM 0.9.3.A</a> (2.8 MB)
     </div><div class="issue-content">24/10/2011: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.2.7/glm-0.9.2.7.7z/download">GLM 0.9.2.7</a> (2.1 MB)

BIN
doc/glm-0.9.3.pdf


BIN
doc/image/0075-1.jpg


+ 22 - 6
doc/index.html

@@ -36,24 +36,40 @@
 			Any feedback is welcome at [email protected].
 		</p><br /><div><h3>08/01/2012 - GLM 0.9.3.0 released</h3><div><p>
         GLM 0.9.3.0 is finally released. Since the branch 0.9.2, the test bench and the Doxygen API documentation has been expend.
-      </p><p>
+      </p><p /><p>
         Swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if
         not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98 
         compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers.
-      </p><span xmlns="http://www.w3.org/1999/xhtml" class="code-title">Implementation for C++ 98 compilers</span><ul xmlns="http://www.w3.org/1999/xhtml" class="code-list"><li class="code-line"><span class="code-line-content"><span class="comment">// To declare before including glm.hpp, to use the swizzle operators</span></span></li><li class="code-line"><span class="code-line-content"><span class="keyword">#define </span> GLM_SWIZZLE 
+      </p><img src="" alt="" /><span xmlns="http://www.w3.org/1999/xhtml" class="code-title">Implementation for C++ 98 compilers:</span><ul xmlns="http://www.w3.org/1999/xhtml" class="code-list"><li class="code-line"><span class="code-line-content"><span class="comment">// To declare before including glm.hpp, to use the swizzle operators</span></span></li><li class="code-line"><span class="code-line-content"><span class="keyword">#define </span> GLM_SWIZZLE 
+        </span></li><li class="code-line"><span class="code-line-content"><span class="keyword">#include </span><span class="string">&lt;glm/glm.hpp&gt;</span></span></li><li class="code-line"><span class="code-line-content" /></li><li class="code-line"><span class="code-line-content"><span class="keyword">void</span> example_cpp98()
+        </span></li><li class="code-line"><span class="code-line-content">
+          {
+        </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
+          glm::vec4 a = glm::vec4(2, 0, 0, 0);
+        </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
+          glm::vec4 b = glm::vec4(0, 2, 0, 0);
+        </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
+          glm::vec3 c = (a.zyx() + b.xyz()) * 0.5f;
+        </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
+          glm::vec2 d = glm::normalize(glm::vec2(c.yz()));
+        </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
+          a.xyzw() = d.xyxy();
+        </span></li><li class="code-line"><span class="code-line-content">
+          }
+        </span></li></ul><span xmlns="http://www.w3.org/1999/xhtml" class="code-title">Implementation for C++ 11 compilers:</span><ul xmlns="http://www.w3.org/1999/xhtml" class="code-list"><li class="code-line"><span class="code-line-content"><span class="comment">// To declare before including glm.hpp, to use the swizzle operators</span></span></li><li class="code-line"><span class="code-line-content"><span class="keyword">#define </span> GLM_SWIZZLE
         </span></li><li class="code-line"><span class="code-line-content"><span class="keyword">#include </span><span class="string">&lt;glm/glm.hpp&gt;</span></span></li><li class="code-line"><span class="code-line-content" /></li><li class="code-line"><span class="code-line-content"><span class="keyword">void</span> example_cpp98()
         </span></li><li class="code-line"><span class="code-line-content">
           {
         </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
-          glm::vec4 a = glm::vec4(1, 0, 0, 0);
+          glm::vec4 a = glm::vec4(2, 0, 0, 0);
         </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
-          glm::vec4 b = glm::vec4(0, 1, 0, 0);
+          glm::vec4 b = glm::vec4(0, 2, 0, 0);
         </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
-          glm::vec3 c = a.zyx() + b.xyz();
+          glm::vec3 c = (a.zyx() + b.xyz()) * 0.5f;
         </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
           glm::vec2 d = glm::normalize(glm::vec2(c.yz));
         </span></li><li class="code-line"><span class="code-line-content" style="padding-left:32px">
-          a.xy = d.xy;
+          a.xyzw = d.xyxy;
         </span></li><li class="code-line"><span class="code-line-content">
           }
         </span></li></ul>Download: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download">GLM 0.9.3.0 (zip)</a><br />Download: <a href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.7z/download">GLM 0.9.3.0 (7z)</a><br />Link: <a href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</a><br />Link: <a href="http://glm.g-truc.net/glm-0.9.3.pdf">GLM 0.9.3 Manual</a><br />Link: <a href="http://glm.g-truc.net/api-0.9.3/index.html">GLM 0.9.3 API</a><br /></div><br /></div><div><h3>12/12/2011 - GLM 0.9.3 beta released</h3><div><p>

+ 15 - 9
doc/src/data.xml

@@ -3,7 +3,7 @@
 <glm copyright="Copyright © 2005 - 2012">
   <downloads>
     <section name="GLM - zip files">
-      <download name="GLM 0.9.3.0" date="08/01/2012" size="4.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download" />
+      <download name="GLM 0.9.3.0" date="09/01/2012" size="4.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.zip/download" />
       <download name="GLM 0.9.3.B" date="12/12/2011" size="4.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.B/glm-0.9.3.B.zip/download"/>
       <download name="GLM 0.9.3.A" date="11/11/2011" size="4.3 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.A/glm-0.9.3.A.zip/download"/>
       <download name="GLM 0.9.2.7" date="24/10/2011" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.2.7/glm-0.9.2.7.zip/download"/>
@@ -73,7 +73,7 @@
       <download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
     </section>
     <section name="GLM - 7z files">
-        <download name="GLM 0.9.3.0" date="08/01/2012" size="2.8 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.7z/download"/>
+        <download name="GLM 0.9.3.0" date="09/01/2012" size="2.8 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.0/glm-0.9.3.0.7z/download"/>
         <download name="GLM 0.9.3.B" date="12/12/2011" size="2.8 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.B/glm-0.9.3.B.7z/download"/>
       <download name="GLM 0.9.3.A" date="11/11/2011" size="2.8 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.3.A/glm-0.9.3.A.7z/download"/>
       <download name="GLM 0.9.2.7" date="24/10/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.2.7/glm-0.9.2.7.7z/download"/>
@@ -175,12 +175,18 @@
         GLM 0.9.3.0 is finally released. Since the branch 0.9.2, the test bench and the Doxygen API documentation has been expend.
       </paragraph>
       <paragraph>
-        Swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if
-        not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98 
-        compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers.
+        For the feature set, the GLSL noise functions have been implemented and based on the implementation of <link href="https://github.com/ashima/webgl-noise">webgl-noise</link>.
+        Some users might prefer the promoted GLM_GTC_noise extension also based on <link href="https://github.com/ashima/webgl-noise">webgl-noise</link> but different interface and three noise methods: Perlin noise, periodic noise and simplex noise.
       </paragraph>
+      <image src="./image/0075-1.jpg" />
       
-      <code title="Implementation for C++ 98 compilers">
+      <paragraph>
+        Finally, swizzle operators are a challenging task to implement but thanks to the effort of many contributors, GLM 0.9.3.0 provides finally something interesting even if
+        not perfect but still a great improvement considering the incompatibilities with some external libraries. GLM 0.9.3 provides two implemetanations, one for C++ 98
+        compilers and one for C++ 11 compilers providing an implemetnation closer to what GLSL does. Indeed the C++ 98 implementation is compatible with C++ 11 compilers.
+      </paragraph>
+
+     <code title="Implementation for C++ 98 compilers:">
         <line>
           <comment>// To declare before including glm.hpp, to use the swizzle operators</comment>          
         </line>
@@ -213,14 +219,14 @@
           glm::vec2 d = glm::normalize(glm::vec2(c.yz()));
         </line>
         <line align="32px">
-          a.xyzw = d.xyxy;
+          a.xyzw() = d.xyxy();
         </line>
         <line>
           }
         </line>
       </code>
 
-      <code title="Implementation for C++ 11 compilers">
+      <code title="Implementation for C++ 11 compilers:">
         <line>
           <comment>// To declare before including glm.hpp, to use the swizzle operators</comment>
         </line>
@@ -250,7 +256,7 @@
           glm::vec3 c = (a.zyx() + b.xyz()) * 0.5f;
         </line>
         <line align="32px">
-          glm::vec2 d = glm::normalize(glm::vec2(c.yz()));
+          glm::vec2 d = glm::normalize(glm::vec2(c.yz));
         </line>
         <line align="32px">
           a.xyzw = d.xyxy;