Merge pull request #103 from Armada651/opengl

Add early version of OpenGL renderer.
OpenXRay · Dec 12, 2015 · 74b862f · 74b862f
2 parents 7efe143 + 6c589d2
commit 74b862f
Show file tree

Hide file tree

Showing 352 changed files with 26,283 additions and 1,297 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -20,3 +20,7 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# Shaders are plain text
+*.vs	 diff=astextplain
+*.ps	 diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-# exclude all dot files except .gitignore
+# exclude all dot files except .git files
 .*
-!.gitignore
+!.git*
 
 # exclude binaries and temporary files
 bin/

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/Externals/glbinding"]
+	path = src/Externals/glbinding
+	url = https://github.com/cginternals/glbinding.git
+[submodule "src/Externals/gli"]
+	path = src/Externals/gli
+	url = https://github.com/g-truc/gli