lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
53 Commits 2 Branches 0 Tags
1d2b1dae192e7e33fd77a7069c4eec11239d9013
Commit Graph

53 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Nilsson
1d2b1dae19 Out-of-source builds without environment variables. 
Using CMake's configure_file command to generate a header file defining
a C string containing the path to the source root directory; the
directory where the resource folder is. Textures and models can now be
found directly as long the user doesn't move stuff around.

Shaders are still a problem.
 2015-08-04 19:41:08 +02:00
Marin Nilsson
83497513eb Using CMake variables setup but find_package(GLFW3) instead of hard-coding the name. 2015-08-04 18:37:03 +02:00
JoeyDeVries
2008ec1bb1 Merge pull request #13 from ibbles/master 
Support for out-of-source builds.
 2015-08-02 21:04:38 +02:00
Marin Nilsson
b03523d3f0 Included description of LOGL_ROOT_PATH in README.md. 
With instructions of when and how to set it.
 2015-08-02 15:16:25 +02:00
Marin Nilsson
26758e0dea Merge remote-tracking branch 'upstream/master' 2015-08-02 13:49:33 +02:00
JoeyDeVries
3678d3411e Merge pull request #14 from zryan3/bugfix/linux_cmake 
refactored CMakeLists to build for Linux Mint 17.2, and ...
 2015-08-02 11:29:25 +02:00
zryan3
bebe39c0be refactored CMakeLists to build for Linux Mint 17.2, and removed std::sqrtf which is not apart of GCC C++ libraries apparently 2015-08-02 00:40:56 -07:00
Marin Nilsson
a8a8d11f22 Support for out-of-source builds. 
Uses environment variable to tell the program where to find resource
files.
Sharder sources are still search for in the current workind directory.
 2015-07-30 21:48:41 +02:00
Joey de Vries
eac76c9a50 New tutorial code 
Added code of new tutorials to the repository
 2015-07-15 11:48:45 +02:00
Joey de Vries
05b24d9268 improved readme 
improved readme
 2015-06-20 12:03:19 +02:00
Joey de Vries
07c805eb31 Added Glitter reference 
Added small description of Glitter in the Readme
 2015-06-20 12:01:56 +02:00
Joey de Vries
711be5ad90 new CMake with added tutorials 
new CMake with added tutorials
 2015-06-20 11:56:32 +02:00
Joey de Vries
635309ef0b New tutorial code 
New tutorial code
 2015-06-20 11:55:58 +02:00
Joey de Vries
c4c3221de9 Added Parallax Mapping code/resources 
Added code samples and necessary texture resources for upcoming Parallax
Mapping tutorial
 2015-06-04 19:59:04 +02:00
Joey de Vries
2a0a415c8f Normal mapping code 
Normal mapping code for normal mapping tutorial (+ few extra's for next
tutorial)
 2015-05-26 22:00:21 +02:00
JoeyDeVries
e1e307f3de Merge pull request #10 from zwookie/master 
fixed Linux error with the gamma variable already being defined in mathcalls.h
 2015-05-23 09:49:39 +02:00
zmertens
4018e023de fixed Linux error with the gamma variable already being defined in mathcalls.h 2015-05-22 20:25:46 -07:00
Joey de Vries
349a95b997 Added Mac OSX instructions 
Added Stéphane's contribution of Mac OSX fork to readme
 2015-05-21 21:26:09 +02:00
Joey de Vries
f6c5ac42fc Shadow tutorials added 
Added source code of shadow mapping and omnidirectional shadow mapping
tutorial.
 2015-05-15 11:25:35 +02:00
Joey de Vries
052070123a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2015-04-27 13:40:44 +02:00
JoeyDeVries
2aef49160b Merge pull request #8 from zwookie/master 
sample keyword is reserved in OpenGL 4.2+
 2015-04-27 13:41:02 +02:00
Joey de Vries
231651b44f Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2015-04-27 13:38:11 +02:00
Joey de Vries
8d0df8edb8 Added new project/code files 2015-04-27 13:37:18 +02:00
zmertens
30d336f044 sample keyword is reserved in GLSL 4.2+ 2015-04-26 11:29:01 -07:00
zmertens
89dc038664 Merge remote-tracking branch 'upstream/master' 
merging from upstream
 2015-04-26 11:14:31 -07:00
JoeyDeVries
edfa0f3855 Merge pull request #7 from zwookie/master 
Escaping out of Geometry shader tutorial
 2015-04-13 09:02:19 +02:00
zmertens
0b0bf8f3e1 Merge branch 'master' of https://github.com/zwookie/LearnOpenGL 
merge
 2015-04-12 21:58:43 -07:00
Zach
7e907a2736 Update README.md 
added backticks to make instruction
 2015-04-12 21:58:24 -07:00
zmertens
c65f173cc2 Merge remote-tracking branch 'upstream/master' 
merge
 2015-04-12 21:54:30 -07:00
zmertens
70d3538927 Merge branch 'master' of https://github.com/zwookie/LearnOpenGL 
merge
 2015-04-12 21:53:19 -07:00
zmertens
049037561a added keyboard call back to geometry shader tutorial 2015-04-12 21:01:31 -07:00
JoeyDeVries
4eff9ea1b1 Merge pull request #6 from zwookie/master 
Improvements to Linux CMake building
 2015-04-08 23:39:00 +02:00
Zach
9602f4d618 Update README.md 
added backticks to make instruction
 2015-04-08 14:23:23 -07:00
zmertens
2193cb3fc4 fixed issue with Linux and CMake not finding resource files when launching executable and edited README for Linux more precise building instructions 2015-04-08 14:20:44 -07:00
Joey de Vries
c9e0b5bdb8 Added '3' to glfw library 
Changed readme to link to glfw3-dev instead of glfw-dev. Linking to glfw
without the '3' links to glfw version 2.
 2015-04-07 18:18:21 +02:00
Joey de Vries
33dba66ea1 Edited/removed comments, changes readme 
Edited/removed comments, changes readme
 2015-04-04 13:33:31 +02:00
JoeyDeVries
949afc1e9c Merge pull request #4 from zwookie/master 
Adjustment to how binaries are built from CMake, small README change
 2015-04-04 13:23:51 +02:00
zwookie
27f3a2b9bc fixed CMake lib / includes path finding during configuration 2015-04-04 02:55:33 -07:00
zmertens
ea910a55ca changed Win32 and Unix method for copying shaders and executables 2015-04-02 13:48:28 -07:00
zmertens
3d71a928ce modified README 2015-04-01 19:52:15 -07:00
zmertens
5c97e68cf4 modified Find*.cmake files to look in the LearnOpenGL local includes and lib directories 2015-04-01 19:48:25 -07:00
zmertens
80d126cfa2 added bin directory to build process to allow resources to load from exectuable 2015-04-01 19:37:41 -07:00
JoeyDeVries
e7f2622fde Merge pull request #3 from zwookie/cmake_features 
Cmake features
 2015-04-01 08:44:58 +02:00
zmertens
38f1272107 moved Apple lib append to Apple if / else statement 2015-03-31 19:13:01 -07:00
zmertens
2098e992b2 CMake builds GLFW correctly and some changes to the layout 2015-03-31 19:01:31 -07:00
zmertens
0b093c5365 added Find*.cmake files and cmake/modules directory 2015-03-31 18:11:48 -07:00
Joey de Vries
7efd3c1e40 Solve merge conflict 
Conflicts:
	CMakeLists.txt
 2015-03-31 17:02:36 +02:00
Joey de Vries
3321b60f79 CMakeList updated + Readme 
Merged changes from Inner_Product s.t. makelist still works as it did
before, now with proper Linux libraries.
 2015-03-31 17:00:57 +02:00
JoeyDeVries
5fa7656460 Merge pull request #2 from zwookie/single_cmake_linux 
modified CMakeLists and fixed includes
 2015-03-31 09:07:54 +02:00
zmertens
4a96cd428c modified CMakeLists and fixed includes 2015-03-31 00:02:08 -07:00