Permalink
Browse files

Updated utf8 includes

Added docs/
  • Loading branch information...
1 parent 238566f commit dd80db82b655808b0a4c42fee8fd9eb00b848b5c @rekotiira committed Nov 10, 2011
View
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>xd documentation</title>
+ <link rel="stylesheet" type="text/css" href="styles.css">
+</head>
+<body>
+ <h1>xd documentation</h1>
+
+ <h2>Introduction</h2>
+ <p>xd is a cross-platform OpenGL based game library written in C++. The aim of the library is to provide the necessary tools to write modern OpenGL games in C++. xd is written in robust C++11 and is tested to work on Windows, OS X and Linux.</p>
+
+ <div id="toc">
+ <h2>Table of Contents</h2>
+ <h3>Getting started</h3>
+ <ol>
+ <li><a href="#">Installation</a></li>
+ <li><a href="#">Architecture</a></li>
+ <li><a href="#">Credits</a></li>
+ <li><a href="#">License</a></li>
+ </ol>
+ <h3>General</h3>
+ <ol>
+ <li><a href="#">Object creation and handles</a></li>
+ <li><a href="#">Event handling</a></li>
+ <li><a href="#">Entities and components</a></li>
+ <li><a href="#">Scene managing</a></li>
+ <li><a href="#">Using configuration files</a></li>
+ </ol>
+ <h3>System</h3>
+ <ol>
+ <li><a href="#">Window handling</a></li>
+ <li><a href="#">Input handling, callbacks and filtering</a></li>
+ <li><a href="#">Registering and using a tick handler</a></li>
+ </ol>
+ <h3>Graphics</h3>
+ <ol>
+ <li><a href="#">Matrix stack</a></li>
+ <li><a href="#">Transforming geometry</a></li>
+ <li><a href="#">Vertex traits and batches</a></li>
+ <li><a href="#">Shader programs</a></li>
+ <li><a href="#">Image loading and texturing</a></li>
+ <li><a href="#">Loading fonts and rendering text</a></li>
+ <li><a href="#">Formatting and animating text</a></li>
+ </ol>
+ <h3>Audio</h3>
+ <ol>
+ <li><a href="#">Playing music and sounds</a></li>
+ <li><a href="#">Using sound effects</a></li>
+ </ol>
+ <h3>Scripting</h3>
+ <ol>
+ <li><a href="#">Loading and running scripts</a></li>
+ <li><a href="#">Scheduling scripts</a></li>
+ <li><a href="#">Using xd from scriots</a></li>
+ <li><a href="#">Writing custom script functionality</a></li>
+ </ol>
+ <h3>Tutorials</h3>
+ <ol>
+ <li><a href="#">Writing your first game</a></li>
+ </ol>
+ </div>
+</body>
+</html>
View
@@ -0,0 +1,42 @@
+body {
+ font-family: "Trebuchet MS", sans-serif;
+ font-size: 12px;
+}
+
+h1 {
+ font-size: 2em;
+ background: #eaeaea;
+ border-bottom: 1px solid #bbb;
+ padding: 2px 5px;
+ margin: 20px 0;
+}
+
+h2 {
+ font-size: 1.5em;
+ background: #eaeaea;
+ border-bottom: 1px solid #bbb;
+ padding: 2px 5px;
+ margin: 10px 0;
+}
+
+h3 {
+ font-size: 1em;
+ background: #eaeaea;
+ border-bottom: 1px solid #bbb;
+ padding: 2px 5px;
+ margin: 5px 0;
+}
+
+a {
+ color: #3370C9;
+ text-decoration: underline;
+}
+
+a:hover {
+ color: #00508C;
+}
+
+#toc ol {
+ margin: 10px 0;
+ padding: 0 30px;
+}
@@ -13,7 +13,7 @@
#include <xd/graphics/vertex_batch.hpp>
#include <xd/graphics/shader_program.hpp>
#include <xd/graphics/transform_geometry.hpp>
-#include <xd/utf8.h>
+#include <xd/vendor/utf8.h>
#ifndef XD_STATIC
// disable warning about boost::noncopyable not being dll-exportable
@@ -14,7 +14,7 @@
#include <xd/graphics/exceptions.hpp>
#include <xd/graphics/font.hpp>
#include <xd/graphics/shader_program.hpp>
-#include <xd/utf8.h>
+#include <xd/vendor/utf8.h>
#ifndef XD_STATIC
// disable warnings about nonstandard extension
@@ -213,14 +213,14 @@
/* Begin PBXShellScriptBuildPhase section */
BE2E861A146AF81900E0E1CF /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
+ buildActionMask = 12;
files = (
);
inputPaths = (
);
outputPaths = (
);
- runOnlyForDeploymentPostprocessing = 1;
+ runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$BUILT_PRODUCTS_DIR/test.app/Contents/MacOS/\"\ninstall_name_tool -change /usr/lib/libc++.1.dylib @executable_path/../Frameworks/xd.framework/Versions/A/Frameworks/libc++.1.dylib test";
};
@@ -1,6 +1,6 @@
#include <xd/graphics/font.hpp>
#include <xd/graphics/exceptions.hpp>
-#include <xd/utf8.h>
+#include <xd/vendor/utf8.h>
#include <memory>
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -8,7 +8,7 @@
#include <boost/lexical_cast.hpp>
#include <xd/graphics/exceptions.hpp>
#include <xd/graphics/text_formatter.hpp>
-#include <xd/utf8.h>
+#include <xd/vendor/utf8.h>
#include <iostream>
namespace xd { namespace detail { namespace text_formatter {

0 comments on commit dd80db8

Please sign in to comment.