LearnOpenGL

lenn/LearnOpenGL

Fork 0

mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00

Commit Graph

Select branches

Hide Pull Requests

master

spelling-test

#1

#1

#10

#100

#101

#102

#103

#104

#105

#107

#108

#116

#117

#118

#127

#13

#134

#134

#137

#137

#138

#14

#149

#15

#151

#159

#16

#162

#166

#173

#174

#175

#176

#177

#179

#181

#183

#184

#185

#188

#188

#190

#191

#192

#193

#199

#199

#2

#200

#201

#202

#203

#203

#205

#215

#215

#222

#228

#230

#231

#231

#233

#234

#236

#236

#237

#237

#24

#245

#246

#247

#249

#250

#251

#254

#255

#262

#263

#264

#270

#272

#273

#274

#275

#276

#277

#277

#28

#280

#284

#285

#289

#290

#291

#293

#294

#296

#297

#3

#300

#301

#304

#306

#307

#312

#312

#315

#319

#319

#320

#320

#321

#321

#323

#323

#326

#329

#332

#334

#335

#336

#338

#338

#339

#342

#343

#346

#347

#348

#35

#352

#353

#354

#355

#355

#357

#358

#36

#360

#362

#362

#370

#370

#374

#374

#384

#386

#386

#387

#388

#389

#39

#390

#390

#396

#397

#397

#4

#40

#401

#402

#402

#407

#407

#409

#409

#41

#41

#42

#45

#45

#58

#59

#6

#61

#62

#62

#63

#63

#67

#68

#69

#69

#7

#70

#71

#73

#74

#74

#75

#76

#77

#8

#80

#80

#81

#83

#85

#87

#92

#93

#94

#95

#96

#96

#97

#99

d2a4a1e655 PBR IBL Specular tutorial code. Joey de Vries 2017-03-31 22:34:26 +02:00
6a41899478 IBL irradiance shader source file fix. Joey de Vries 2017-02-25 12:00:34 +01:00
691215afa3 PBR IBL irradiance tutorials. Joey de Vries 2017-02-25 11:19:00 +01:00
534b6ec8c9 IBL Diffuse irradiance source code. Note that these projects use stb_image.h directly, but still link with SOIL causing libray conflicts. Run these specific projects by not linking to SOIL. This will get resolved the moment all projects run on stb_image.h instead of SOIL. Joey de Vries 2017-02-16 22:42:05 +01:00
fabdd1c86d Model: string comparrison fix, see issue #49. Joey de Vries 2017-02-15 21:51:15 +01:00
c5b584deb9 Improved CMakeLists for clearer project setup with added library support for stb_image. Joey de Vries 2017-01-18 21:56:31 +01:00
96ced3c198 PBR attenuation fix with proper Fresnel adjustments. Joey de Vries 2017-01-09 19:57:53 +01:00
5042701210 Ambient light to correspond with tutorial's version. Joey de Vries 2016-12-18 11:45:35 +01:00
0f78bb69ae Prevent double multiplication of Fresnel. Joey de Vries 2016-12-18 11:28:01 +01:00
70f2ec7c1b Adjust code to more properly reflect tutorial. Joey de Vries 2016-12-17 21:53:41 +01:00
ec42b25235 Tutorial spacing fix. Joey de Vries 2016-12-17 21:34:46 +01:00
15e7808d55 Adjustments to PBR lighting code. Joey de Vries 2016-12-17 21:29:22 +01:00
9e2f12aeaa Updated PBR code samples. Joey de Vries 2016-12-17 15:58:17 +01:00
0a46f53608 Template PBR lighting tut with folder re-structure to fit PBR tuts. Joey de Vries 2016-12-12 21:10:58 +01:00
b2657d7e1c Some SSAO improvements. Joey de Vries 2016-12-06 20:20:26 +01:00
5a17132991 Multiply ambient component with diffuse's surface (albedo) color. Joey de Vries 2016-12-05 22:21:11 +01:00
47048b9840 Updated SSAO tutorial. Joey de Vries 2016-12-05 21:13:41 +01:00
621f28fc65 Normal mapping gram-schmidth bugfix. Joey de Vries 2016-11-23 08:12:53 +01:00
fad0497731 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2016-10-24 09:10:50 +02:00
494dba710d Issue #43 Joey de Vries 2016-10-24 09:10:12 +02:00
295fe46250 Merge pull request #42 from tikhomirov/fix-cmake-macos Joey de Vries 2016-10-18 19:39:06 +02:00
ee739051cb Fix CMakeLists.txt for macOS Sergey Tikhomirov 2016-10-18 17:31:53 +03:00
af6104b2f5 Instancing glDrawElements argument fix. Joey de Vries 2016-10-12 18:53:19 +02:00
c819799803 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2016-10-03 21:47:20 +02:00
93d9412ba7 Asteroid instancing example bugfix. Joey de Vries 2016-10-03 18:23:35 +02:00
aab78b0747 Merge pull request #40 from zryan3/patch-1 Joey de Vries 2016-09-14 21:52:39 +02:00
d3d808f9d9 Update README.md Zach 2016-09-14 12:47:40 -07:00
7ec34f7931 Merge pull request #39 from xiaofeii2/master Joey de Vries 2016-08-27 12:35:33 +02:00
8baa9bf99e Fixed bug: cannot load images in vs2015. txf 2016-08-25 15:16:46 +08:00
de9593226f Merge pull request #36 from drahak/master Joey de Vries 2016-07-06 15:23:11 +02:00
a1638ea19a Fix switching draw mode in SSAO deferred shader Drahomír Hanák 2016-07-06 15:09:56 +02:00
28877f8aec Merge pull request #35 from ozan/patch-1 Joey de Vries 2016-07-03 20:05:15 +02:00
4198516138 Fix typo Ozan Onay 2016-07-03 08:23:53 -07:00
4d3a93859d Issue #33: removed text rendering from repository for now. J. de Vries 2016-05-24 14:11:10 +02:00
bd75a3b830 Issue #32: Removed C++ variable list initialization due to compiler conflicts. J. de Vries 2016-05-24 13:31:26 +02:00
30c6c04bf4 Forgot to add text_rendering source file to GitHub. J. de Vries 2016-05-24 10:18:28 +02:00
11b26e6fc3 comments fix J. de Vries 2016-05-11 20:07:16 +02:00
b63d9af161 New debugging tutorial source code w/ artificial errors. J. de Vries 2016-05-11 20:05:16 +02:00
a4c2bb2498 Updated GLM version w/ now standard radians as angles. J. de Vries 2016-05-11 20:04:52 +02:00
336df22af5 Added source code for debugging tutorials; new code_viewer directly loads from GitHub. J. de Vries 2016-05-11 19:43:32 +02:00
f313234c9a Fix viewport display for high-DPI devices. J. de Vries 2016-04-30 11:38:05 +02:00
2c04801327 Instancing asteroid object texture fix (resolution was too high) J. de Vries 2016-03-30 16:49:25 +02:00
f3b4c15984 Merge pull request #28 from fluffyfreak/fix-instance-texturing Joey de Vries 2016-03-30 16:47:06 +02:00
7ee4d9b56a Bind the rock models texture to the shaders sampler so texture mapping works in instancing example. Andrew Copland 2016-03-30 10:53:53 +01:00
d7ed65ff5d Shadow mapping view frustum clean-up (more intuitive LookAt Up vector). J. de Vries 2016-03-28 01:07:11 +02:00
d5c3be70ab Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL J. de Vries 2016-03-06 11:29:09 +01:00
d082668b2b new glfw3 compiled w/ VS2015 J. de Vries 2016-03-06 11:24:51 +01:00
2bf1ed16f1 Fix: framebuffer color format. J. de Vries 2016-03-06 11:24:34 +01:00
d0e667d544 Merge pull request #24 from andrewparlane/master Joey de Vries 2016-01-20 12:06:37 +01:00
1e9908378e Deferred Shading: Fixed bug with the normal texture component of the gBuffer. Andrew Parlane 2016-01-19 22:29:05 -04:00
20999a1b68 Update to depth testing article Joey de Vries 2015-08-12 10:07:53 +02:00
236cc79dc3 Merge pull request #16 from ibbles/master JoeyDeVries 2015-08-04 22:03:53 +02:00
eeb22a792a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Marin Nilsson 2015-08-04 19:51:40 +02:00
1d2b1dae19 Out-of-source builds without environment variables. Marin Nilsson 2015-08-04 19:41:08 +02:00
1973ab6987 Merge pull request #15 from ibbles/master JoeyDeVries 2015-08-04 19:39:22 +02:00
83497513eb Using CMake variables setup but find_package(GLFW3) instead of hard-coding the name. Marin Nilsson 2015-08-04 18:37:03 +02:00
2008ec1bb1 Merge pull request #13 from ibbles/master JoeyDeVries 2015-08-02 21:04:38 +02:00
b03523d3f0 Included description of LOGL_ROOT_PATH in README.md. Marin Nilsson 2015-08-02 15:16:25 +02:00
26758e0dea Merge remote-tracking branch 'upstream/master' Marin Nilsson 2015-08-02 13:49:33 +02:00
3678d3411e Merge pull request #14 from zryan3/bugfix/linux_cmake JoeyDeVries 2015-08-02 11:29:25 +02:00
bebe39c0be refactored CMakeLists to build for Linux Mint 17.2, and removed std::sqrtf which is not apart of GCC C++ libraries apparently zryan3 2015-08-02 00:40:56 -07:00
a8a8d11f22 Support for out-of-source builds. Marin Nilsson 2015-07-30 21:48:41 +02:00
eac76c9a50 New tutorial code Joey de Vries 2015-07-15 11:48:45 +02:00
05b24d9268 improved readme Joey de Vries 2015-06-20 12:03:19 +02:00
07c805eb31 Added Glitter reference Joey de Vries 2015-06-20 12:01:56 +02:00
711be5ad90 new CMake with added tutorials Joey de Vries 2015-06-20 11:56:32 +02:00
635309ef0b New tutorial code Joey de Vries 2015-06-20 11:55:58 +02:00
c4c3221de9 Added Parallax Mapping code/resources Joey de Vries 2015-06-04 19:59:04 +02:00
2a0a415c8f Normal mapping code Joey de Vries 2015-05-26 22:00:13 +02:00
e1e307f3de Merge pull request #10 from zwookie/master JoeyDeVries 2015-05-23 09:49:39 +02:00
4018e023de fixed Linux error with the gamma variable already being defined in mathcalls.h zmertens 2015-05-22 20:25:46 -07:00
349a95b997 Added Mac OSX instructions Joey de Vries 2015-05-21 21:26:09 +02:00
f6c5ac42fc Shadow tutorials added Joey de Vries 2015-05-15 11:25:35 +02:00
052070123a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2015-04-27 13:40:44 +02:00
2aef49160b Merge pull request #8 from zwookie/master JoeyDeVries 2015-04-27 13:41:02 +02:00
231651b44f Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2015-04-27 13:38:11 +02:00
8d0df8edb8 Added new project/code files Joey de Vries 2015-04-27 13:37:18 +02:00
30d336f044 sample keyword is reserved in GLSL 4.2+ zmertens 2015-04-26 11:29:01 -07:00
89dc038664 Merge remote-tracking branch 'upstream/master' zmertens 2015-04-26 11:14:31 -07:00
edfa0f3855 Merge pull request #7 from zwookie/master JoeyDeVries 2015-04-13 09:02:19 +02:00
0b0bf8f3e1 Merge branch 'master' of https://github.com/zwookie/LearnOpenGL zmertens 2015-04-12 21:58:43 -07:00
7e907a2736 Update README.md Zach 2015-04-08 14:23:23 -07:00
c65f173cc2 Merge remote-tracking branch 'upstream/master' zmertens 2015-04-12 21:54:30 -07:00
70d3538927 Merge branch 'master' of https://github.com/zwookie/LearnOpenGL zmertens 2015-04-12 21:53:19 -07:00
049037561a added keyboard call back to geometry shader tutorial zmertens 2015-04-12 21:01:31 -07:00
4eff9ea1b1 Merge pull request #6 from zwookie/master JoeyDeVries 2015-04-08 23:39:00 +02:00
9602f4d618 Update README.md Zach 2015-04-08 14:23:23 -07:00
2193cb3fc4 fixed issue with Linux and CMake not finding resource files when launching executable and edited README for Linux more precise building instructions zmertens 2015-04-08 14:20:44 -07:00
c9e0b5bdb8 Added '3' to glfw library Joey de Vries 2015-04-07 18:18:21 +02:00
33dba66ea1 Edited/removed comments, changes readme Joey de Vries 2015-04-04 13:33:31 +02:00
949afc1e9c Merge pull request #4 from zwookie/master JoeyDeVries 2015-04-04 13:23:51 +02:00
27f3a2b9bc fixed CMake lib / includes path finding during configuration zwookie 2015-04-04 02:55:33 -07:00
ea910a55ca changed Win32 and Unix method for copying shaders and executables zmertens 2015-04-02 13:48:28 -07:00
3d71a928ce modified README zmertens 2015-04-01 19:52:15 -07:00
5c97e68cf4 modified Find*.cmake files to look in the LearnOpenGL local includes and lib directories zmertens 2015-04-01 19:48:25 -07:00
80d126cfa2 added bin directory to build process to allow resources to load from exectuable zmertens 2015-04-01 19:37:41 -07:00
e7f2622fde Merge pull request #3 from zwookie/cmake_features JoeyDeVries 2015-04-01 08:44:58 +02:00
38f1272107 moved Apple lib append to Apple if / else statement zmertens 2015-03-31 19:13:01 -07:00
2098e992b2 CMake builds GLFW correctly and some changes to the layout zmertens 2015-03-31 19:01:31 -07:00
0b093c5365 added Find*.cmake files and cmake/modules directory zmertens 2015-03-31 18:11:48 -07:00