瀏覽代碼

Moved about in front page

Christophe Riccio 15 年之前
父節點
當前提交
89d57a41ec
共有 7 個文件被更改,包括 100 次插入55 次删除
  1. 6 0
      doc/common/style.css
  2. 1 1
      doc/src/about.xsl
  3. 43 27
      doc/src/data.xml
  4. 1 1
      doc/src/download.xsl
  5. 1 1
      doc/src/link.xsl
  6. 11 21
      doc/src/news.xsl
  7. 37 4
      doc/src/util.xsl

+ 6 - 0
doc/common/style.css

@@ -235,6 +235,12 @@ ul.code-list
 	margin-right:0px;
 }
 
+li
+{
+	list-style-position:inside;
+	padding-left:8px;
+}
+
 li.code-line
 {
 	color:#008080;

+ 1 - 1
doc/src/about.xsl

@@ -7,7 +7,7 @@
   <xsl:template match="/">
     <html>
       <head>
-        <title>OpenGL Mathematics : About</title>
+        <title>OpenGL Mathematics: About</title>
         <meta http-equiv="Content-Language" content="en" />
         <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1" />
         <meta name="copyright" content="G-Truc Creation" />

+ 43 - 27
doc/src/data.xml

@@ -2793,25 +2793,45 @@
     </bug>
   </bugs>
 
-  <about-long date=" " title=" ">
-    <paragraph>
-      OpenGL Mathematics (GLM) is a C++ mathematics library for 3D software based on the OpenGL Shading Language (GLSL) specification.
-    </paragraph>
-    <paragraph>
-      The goal of the project is to provide to 3D programmers math classes and functions that miss in C++ when we use to program with GLSL or any high level GPU language. With GLM, the idea is to have a library that works the same way that GLSL which imply a strict following of GLSL specification for the implementation.
-    </paragraph>
-    <paragraph>
-      However, this project isn't limited by GLSL features. An extension system allows to extend GLSL capabilities. It allows GLM to be a great subtitute for some OpenGL 3 deprecated functions, to work following a clean programmable approach.
-    </paragraph>
-    <paragraph>
-      GLM is release under <link href="./copying.txt">MIT license</link> and available for all version of GCC from version 3.4 and Visual Studio from version 8.0 as a platform independent library.
-    </paragraph>
-  </about-long>
-
-  <about-short>
-    <element>GLSL + Optional features = OpenGL Mathematics (GLM).</element>
-    <element>A C++ mathematics library for 3D graphics.</element>
-  </about-short>
+	<about-long date=" " title=" ">
+		<paragraph>
+			OpenGL Mathematics (GLM) is a header only C++ mathematics library for graphics software 
+			based on the <link href="http://www.opengl.org/documentation/glsl/">OpenGL Shading Language (GLSL)</link> specification.
+		</paragraph>
+		<paragraph>
+			GLM provides classes and functions designed and 
+			implemented with the same naming conventions 
+			and functionalities than GLSL so that 
+			when a programmer knows GLSL, he knows GLM as well which makes it really easy to use.
+		</paragraph>
+		<paragraph>
+			This project isn't limited by GLSL features. 
+			An extension system, based on the GLSL extension conventions, 
+			provides extended capabilities: matrix transformations, 
+			quaternions, half-based types, random numbers, etc...
+		</paragraph>
+		<paragraph>
+			This library works perfectly with OpenGL but it also ensures interoperability with other third party libraries and SDKs. It is a good candidate for software rendering (Raytracing / Rasterisation), image processing, physic simulations and any context that requires a simple and convenient mathematics library.
+		</paragraph>
+		<list name="GLM is written as a platform independent library with no dependence and officially supports the following compilers:">
+			<list-element><link href="http://http://gcc.gnu.org/">GCC</link> 3.4 and higher</list-element>
+			<list-element><link href="http://llvm.org/">LLVM</link> 2.3 through GCC 4.2 front-end and higher</list-element>
+			<list-element><link href="http://msdn.microsoft.com/en-us/visualc/default">Visual C++</link> 2005 and higher</list-element>
+			<list-element>Any C++ compiler following C++98 norm</list-element>
+		</list>
+		<paragraph>
+			The source code is under the <link href="./copying.txt">MIT license</link>.
+		</paragraph>
+		<paragraph>
+			Thanks for contributing to the project by <link href="https://sourceforge.net/apps/trac/ogl-math/newticket">submitting tickets</link> for bug reports and feature requests. (SF.net account required).
+			Any feedback is welcome at <a href="mailto://[email protected]">[email protected]</a>.
+		</paragraph>
+	</about-long>
+
+	<about-short>
+		<element>GLSL + Optional features = OpenGL Mathematics (GLM).</element>
+		<element>A C++ mathematics library for 3D graphics.</element>
+	</about-short>
 
   <goodies>
     <goodie date="16/10/2008" title="GLM Logo" image="goodies/logo.png" image-mini="image/logo-mini.png">
@@ -2832,29 +2852,25 @@
 
   <menu>
     <menu-group name="Main">
-      <menu-entry name="News" href="./index.html" />
-      <menu-entry name="About" href="./about.html" />
+      <menu-entry name="Front page" href="./index.html" />
       <menu-entry name="Downloads" href="./download.html" />
-      <menu-entry name="Goodies" href="./goodies.html" />
 		<menu-entry name="OpenGL SDK page" href="http://www.opengl.org/sdk/libs/GLM/" />
     </menu-group>
 
     <menu-group name="Documentation">
       <menu-entry name="GLM Manual" href="./glm-0.9.1.pdf" />
-      <menu-entry name="GLM API" href="./html-0.9.1/index.html" />
+      <menu-entry name="GLM API" href="./api-0.9.1/index.html" />
       <menu-entry name="Code samples" href="./code.html" />
       <menu-entry name="GLSL Specification" href="http://www.opengl.org/registry/doc/GLSLangSpec.4.10.6.clean.pdf" />
       <menu-entry name="OpenGL.org Toolkits forum" href="http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=postlist&amp;Board=10&amp;page=1" />
-      <!--menu-entry name="Usage" href="./usage.html" /-->
     </menu-group>
 
     <menu-group name="Developer">
-      <!--menu-entry name="Contribute" href="./contribute.html" /-->
-		<menu-entry name="Bug report" href="https://sourceforge.net/apps/trac/ogl-math" />
+		<menu-entry name="Report a bug" href="https://sourceforge.net/apps/trac/ogl-math/newticket" />
 		<menu-entry name="SourceForge page" href="https://sourceforge.net/projects/ogl-math/" />
 		<menu-entry name="G-Truc Creation page" href="http://www.g-truc.net/project-0016.html#menu" />
       <menu-entry name="Browse Git repository" href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=summary" />
-      <menu-entry name="GIT HEAD snapshot" href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=snapshot;h=HEAD;sf=tgz" />
+      <menu-entry name="Source snapshot" href="http://ogl-math.git.sourceforge.net/git/gitweb.cgi?p=ogl-math/ogl-math;a=snapshot;h=HEAD;sf=tgz" />
     </menu-group>
 
     <menu-link>

+ 1 - 1
doc/src/download.xsl

@@ -7,7 +7,7 @@
   <xsl:template match="/">
     <html>
       <head>
-        <title>OpenGL Mathematics : Downloads</title>
+        <title>OpenGL Mathematics: Downloads</title>
         <meta http-equiv="Content-Language" content="en" />
         <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1" />
         <meta name="copyright" content="G-Truc Creation" />

+ 1 - 1
doc/src/link.xsl

@@ -7,7 +7,7 @@
   <xsl:template match="/">
     <html>
       <head>
-        <title>OpenGL Mathematics : Links</title>
+        <title>OpenGL Mathematics: Links</title>
         <meta http-equiv="Content-Language" content="fr, be, ca, lu, ch" />
         <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1" />
         <meta name="copyright" content="&#65533; 2005 C-Truc Creation" />

+ 11 - 21
doc/src/news.xsl

@@ -7,7 +7,7 @@
   <xsl:template match="/">
     <html>
       <head>
-        <title>OpenGL Mathematics: News</title>
+        <title>OpenGL Mathematics</title>
         <meta http-equiv="Content-Language" content="en" />
         <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=iso-8859-1" />
         <meta name="copyright" content="G-Truc Creation" />
@@ -38,6 +38,8 @@
                 <img src="./common/title.png" alt="OpenGL Mathematics" />
               </div>
               <xsl:apply-templates select="./glm/about-short" />
+				<br />
+				<xsl:apply-templates select="./glm/about-long" />
               <br />
               <xsl:apply-templates select="./glm/page_news/news" />
               <div class="title3">
@@ -53,29 +55,17 @@
 
   <xsl:template match="news">
     <div>
-      <div class="title-date">
-        <xsl:value-of select="./@date" />
-      </div>
 		<h3>
+			<xsl:value-of select="./@date" /><xsl:text> - </xsl:text>
 			<xsl:value-of select="./@title" />
 		</h3>
-      <div>
-        <xsl:if test="./paragraph">
-          <xsl:apply-templates select="./paragraph" />
-        </xsl:if>
-        <xsl:if test="./list">
-          <xsl:apply-templates select="./list" />
-        </xsl:if>
-		  <xsl:if test="./code">
-			  <xsl:apply-templates select="./code" />
-		  </xsl:if>
-        <xsl:apply-templates select="./source" />
-
-		<!--xsl:apply-templates select="/" /-->
-
-      </div>
-      <div class="news-separator">_________________</div>
-      <br />
+		<div>
+			<xsl:apply-templates select="./paragraph" />
+			<xsl:apply-templates select="./list" />
+			<xsl:apply-templates select="./code" />
+			<xsl:apply-templates select="./source" />
+		</div>
+		<br />
     </div>
   </xsl:template>
 

+ 37 - 4
doc/src/util.xsl

@@ -52,9 +52,42 @@
 	  </xsl:template>
 
 	<xsl:template match="list">
-		<xsl:value-of select="./@nom" /><br />
-		<xsl:apply-templates select="./element"/>
-		<br />
+		<div xmlns="http://www.w3.org/1999/xhtml">
+			<xsl:if test="./@name">
+				<xsl:choose>
+					<xsl:when test="./@href">
+						<span class="list">
+							<a href="{./@href}">
+								<xsl:value-of select="./@name" />
+							</a>
+						</span>
+					</xsl:when>
+					<xsl:otherwise>
+						<span class="list">
+							<xsl:value-of select="./@name" />
+						</span>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:if>
+			<ul>
+				<xsl:apply-templates select="./list-element"/>
+			</ul>
+		</div>
+	</xsl:template>
+
+	<xsl:template match="list-element">
+		<li xmlns="http://www.w3.org/1999/xhtml">
+			<xsl:choose>
+				<xsl:when test="./@href">
+					<a href="{./@href}">
+						<xsl:apply-templates />
+					</a>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates />
+				</xsl:otherwise>
+			</xsl:choose>
+		</li>
 	</xsl:template>
 
 	<xsl:template match="element">
@@ -62,7 +95,7 @@
 	</xsl:template>
 
 	<xsl:template match="paragraph">
-		<div class="paragraph"><xsl:text /><xsl:apply-templates /><xsl:text /></div><br />
+		<p><xsl:text /><xsl:apply-templates /><xsl:text /></p>
 	</xsl:template>
 
 	<xsl:template match="about-short">