moved shaders and images
added: working geometry shader
cleaned up shaders
cleaned up shaders
added: project readme
added: shader readme and structured up a bit
copied and renamed old working shaders
testing multi commits
attempting to make GLSL version 3.30 work
Merge branch 'master' of github.com:ColacX/ColacX_Game_000

Conflicts:
	project_readme.txt
unversioned some vcproj file
added: data files and external files to make cloning easier
added: file
got shader example 400 working
forgot to add important DLL
struggling with z-position in vertex shader
got glm to work
red triangle
GEOMETRY WORKS! YAY With colors!
backed up working geometry shader
failed attempt
moved code to Terrain000.h
added Terrain001.h idea
begun work on Water000.h
officially added glm
cleaned up: moved working directory removed some spaceas
fixed water mesh
split up texture.h in C and G methods
water000 working multitexturing and vertex wave shader
begun work on Terrain000.h moved water shaders
successfully mapped all terrain triangles working
cleaned up
added some diffrent draw modes and hotkeyed them
fixed: controls would be locked even when window was unfocused
forgot
improved: Water000.h
asdasd
amendment to last commit. added: almost working Camera000.h and some ideas
removed trivial crap
fixed: camera it works!
almost got lookat working
cleaned up and optimized
experimenting with with camera lookat
beginning work on TessellationTeapot.h
dropping tesselation tests for now
beginning work on bullet plasma effects
optimized cpu usage greatly. bind buffer vbo
now! im working on the bullet effect
maximised window and also just released that you cant see bullets because they fly so fast in realistic
updated to vs2010
readded: the old triangle geometry shader test. remember to save useful programs and improve handling of external resources
added point to quad geometry shader. almost got a sprite shader working.
begun some work on geometry shaders cloud particles and self shadowing
cleaned up the code a little
removed some binary files from git
removed binary file from version control
added: working shadowing and cuda depth sorting and cuda with gl drawing
todo: change algorithm for computing shadowing
added git ignore to version control
moved shaders and images
added: working geometry shader
cleaned up shaders
cleaned up shaders
added: project readme
added: shader readme and structured up a bit
copied and renamed old working shaders
testing multi commits
attempting to make GLSL version 3.30 work
Merge branch 'master' of github.com:ColacX/ColacX_Game_000

Conflicts:
	project_readme.txt
unversioned some vcproj file
added: data files and external files to make cloning easier
added: file
got shader example 400 working
forgot to add important DLL
struggling with z-position in vertex shader
got glm to work
red triangle
GEOMETRY WORKS! YAY With colors!
backed up working geometry shader
failed attempt
moved code to Terrain000.h
added Terrain001.h idea
begun work on Water000.h
officially added glm
cleaned up: moved working directory removed some spaceas
fixed water mesh
split up texture.h in C and G methods
water000 working multitexturing and vertex wave shader
begun work on Terrain000.h moved water shaders
successfully mapped all terrain triangles working
cleaned up
added some diffrent draw modes and hotkeyed them
fixed: controls would be locked even when window was unfocused
forgot
improved: Water000.h
asdasd
amendment to last commit. added: almost working Camera000.h and some ideas
removed trivial crap
fixed: camera it works!
almost got lookat working
cleaned up and optimized
experimenting with with camera lookat
beginning work on TessellationTeapot.h
dropping tesselation tests for now
beginning work on bullet plasma effects
optimized cpu usage greatly. bind buffer vbo
now! im working on the bullet effect
maximised window and also just released that you cant see bullets because they fly so fast in realistic
updated to vs2010
readded: the old triangle geometry shader test. remember to save useful programs and improve handling of external resources
added point to quad geometry shader. almost got a sprite shader working.
begun some work on geometry shaders cloud particles and self shadowing
cleaned up the code a little
removed some binary files from git
removed binary file from version control
added: working shadowing and cuda depth sorting and cuda with gl drawing
todo: change algorithm for computing shadowing
added git ignore to version control
deleted binary files