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

2178776423 decoupled assimp from mesh.h Galfatron 2017-11-27 20:16:05 -08:00
56dfb32615 Merge pull request #93 from stfx/patch-4 Joey de Vries 2017-11-26 22:35:32 +01:00
ca3e64e17e Merge pull request #92 from stfx/patch-3 Joey de Vries 2017-11-26 22:34:32 +01:00
b4982b4611 Fix another graphical error showing a black box stfx 2017-11-26 22:10:59 +01:00
c217609890 Fix rare graphical error showing a black box stfx 2017-11-26 20:03:44 +01:00
91bb8e8ca9 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-11-03 19:15:37 +01:00
e0edef36dd Update CMakeLists for consistent paths on Linux builds. Joey de Vries 2017-11-03 19:12:22 +01:00
b5af4b8191 Merge pull request #87 from zlixine/master Joey de Vries 2017-10-30 08:30:43 +01:00
f68f84e8d9 Much faster mesh rendering with c++11 std::to_string Zlixine 2017-10-30 02:10:15 +02:00
ea32df7b91 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-10-21 10:07:27 +02:00
d4b675bbcd Set max specular IBL reflection mip level to 4.0 to match the number of generated mips. Joey de Vries 2017-10-21 10:07:19 +02:00
65b30bd3ed Merge pull request #85 from dotlive/master Joey de Vries 2017-10-19 09:08:24 +02:00
8fef6cdd3e fix shader file’s variable name dismatched with source file’s. dotlive 2017-10-19 07:30:33 +08:00
922e127d0e fix macOS load shader failed. dotlive 2017-10-19 07:28:10 +08:00
3a04c6f9f4 Fix reflection mip level constant on PBR textured scene. Joey de Vries 2017-09-26 19:11:01 +02:00
673fe1e89f Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-09-21 08:35:18 +02:00
2e0035a8d4 fix: use radians instead of degrees for camera zoom. Joey de Vries 2017-09-21 08:35:13 +02:00
9952702741 Merge pull request #81 from stfx/patch-2 Joey de Vries 2017-09-11 08:45:32 +02:00
a27923630b Merge pull request #83 from lostplesed/patch-1 Joey de Vries 2017-08-29 09:15:53 +02:00
0cb58d04ba fix mac build failed lost plesed 2017-08-29 11:47:04 +08:00
33ee64327f Fix typo stfx 2017-08-19 16:59:35 +02:00
dc4dee3f82 Fix Bloom in rare cases stfx 2017-08-19 16:57:49 +02:00
c6b404915d Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-07-24 20:08:58 +02:00
b379c0fe74 Additional statements to clarify usage of FileSystem namespace in Textures tutorial. Joey de Vries 2017-07-24 20:08:53 +02:00
d2c0775928 Merge pull request #77 from shivmsit/osx_cmake_fix Joey de Vries 2017-07-12 18:13:40 +02:00
b5848894eb Add glfw hint for GLFW_OPENGL_FORWARD_COMPAT for more samples to let it work on osx Shivpratap Chauhan 2017-07-12 21:33:07 +05:30
c591154e15 Merge pull request #76 from shivmsit/osx_cmake_fix Joey de Vries 2017-07-12 13:50:45 +02:00
2d16ef0fe2 GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx to create glfw window successfully Shivpratap Chauhan 2017-07-12 17:06:00 +05:30
18197233c7 Merge pull request #75 from shivmsit/osx_cmake_fix Joey de Vries 2017-07-11 21:54:12 +02:00
95598f250a osx cmake build fixes. Shivpratap Chauhan 2017-07-12 00:45:06 +05:30
effe69f83d Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-07-10 08:37:02 +02:00
103b4f6358 Coordinate system code fix. Joey de Vries 2017-07-10 08:36:52 +02:00
8f66784a79 Merge pull request #73 from d3BugErr/master Joey de Vries 2017-07-04 13:40:25 +02:00
c4c5fea218 Changed MSVC std::sqrtf call to simple std::sqrt - causes compile failure on mingw toolchain, as no such fucntion is present. Erik 2017-07-04 13:40:47 +03:00
f3bda045c1 Merge pull request #71 from tielei/minor_fix Joey de Vries 2017-06-29 17:32:50 +02:00
e7382fdfb0 fix texture1 uniform name & two shader variables Charles Zhang 2017-06-29 18:37:08 +08:00
905be9ce52 Use appropriate texture fs name on setting uniform. Joey de Vries 2017-06-29 08:38:48 +02:00
d67d69712d Merge pull request #70 from tielei/minor_fix Joey de Vries 2017-06-29 08:36:02 +02:00
ecc7e7ca92 Variable name does not match with that in frag shader Charles Zhang 2017-06-29 14:32:27 +08:00
1e2398e92b Add license file, code to public domain. Joey de Vries 2017-06-29 08:12:50 +02:00
4bd8846929 Merge pull request #61 from amesgames/master Joey de Vries 2017-06-29 08:10:14 +02:00
aa22112332 Merge pull request #68 from 64/master Joey de Vries 2017-06-18 23:20:47 +02:00
4a94fbf2bf Add commented out code to allow window creation on OSX Matthew Taylor 2017-06-18 01:53:16 +01:00
8ffb45834b Merge pull request #67 from 64/master Joey de Vries 2017-06-18 01:54:02 +02:00
120c8c8c11 Fix OSX errors and warnings Matthew Taylor 2017-06-18 00:39:07 +01:00
30caeb3489 mesh/model header include fixes. Joey de Vries 2017-06-16 19:11:52 +02:00
8c45cab498 Final PBR adjustments on code/content-rework. Joey de Vries 2017-06-02 23:03:46 +02:00
5eddf64303 Code and content re-work: advanced lighting. Joey de Vries 2017-06-02 22:53:53 +02:00
f844f7c541 Code and content re-work: advanced OpenGL and advanced lighting. Joey de Vries 2017-06-01 22:04:34 +02:00
49d8d895ae Updated source code to reflect content changes (code re-work): advanced OpenGL and model-loading. Joey de Vries 2017-05-31 23:12:15 +02:00
70b789d3b9 Code re-work with content: model-loading. Joey de Vries 2017-05-31 19:02:05 +02:00
e2e36d6ff8 Code re-work and content update: lighting. Joey de Vries 2017-05-30 22:17:40 +02:00
320db41e89 Code re-work and content update: lighting. Joey de Vries 2017-05-30 19:23:56 +02:00
18e5fdb443 Code/content re-work: getting started. Joey de Vries 2017-05-29 23:47:28 +02:00
79e22d716e Content/code update: coordinate systems. Joey de Vries 2017-05-29 22:43:07 +02:00
28eb2bbf62 Updated code changes to reflect content updates. Joey de Vries 2017-05-29 21:04:33 +02:00
5846428705 Getting started content code-rework updates. Joey de Vries 2017-05-29 20:36:10 +02:00
bc718162b1 Another shader tab/whitespace fix. Joey de Vries 2017-05-28 08:58:38 +02:00
d78752800f Shader tab fix. Joey de Vries 2017-05-28 08:56:30 +02:00
e84046aecc Removed code re-work warning. Joey de Vries 2017-05-28 08:54:23 +02:00
13ad6528cd Final updates on PBR tutorials w/ updated code. Joey de Vries 2017-05-28 08:52:26 +02:00
a398a343a4 PBR Shader fix to code standard. Joey de Vries 2017-05-26 15:49:29 +02:00
701f4fe608 Fix build errors w/ long path name. Joey de Vries 2017-05-26 15:07:44 +02:00
ecd23d4de0 All PBR tuts updated. Joey de Vries 2017-05-26 15:00:56 +02:00
b5ea38f87f Update early PBR chapters to conform to new code standard. Joey de Vries 2017-05-26 13:18:50 +02:00
5001977dad Fixed stencil testing sample to actually set the uniform matrices on the single color shader program. Without it, the border does not show up. Andrew Ames 2017-04-25 14:48:33 -07:00
ec4cc678d6 warning update. Joey de Vries 2017-04-25 19:11:49 +02:00
6f9706af45 Code re-work: Debugging Joey de Vries 2017-04-25 18:59:08 +02:00
f95da5cccd Code re-work: SSAO Joey de Vries 2017-04-24 22:57:05 +02:00
0948dfec05 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL Joey de Vries 2017-04-24 20:55:41 +02:00
4d5aed34ac Code re-work: deferred shading. Joey de Vries 2017-04-24 20:55:39 +02:00
bedbcda4cf Code re-work: bloom. Joey de Vries 2017-04-24 20:36:40 +02:00
437d55dd4f Merge pull request #59 from elect86/patch-2 Joey de Vries 2017-04-24 20:18:03 +02:00
b06e6450a2 Merge pull request #58 from elect86/patch-1 Joey de Vries 2017-04-24 20:17:57 +02:00
f4001a9def Update shaders_class.cpp Giuseppe Barbieri 2017-04-24 19:27:16 +02:00
745ad721bd Update shader_s.h Giuseppe Barbieri 2017-04-24 19:25:55 +02:00
5491450bde Added re-work warning. Joey de Vries 2017-04-23 22:45:02 +02:00
20d5811d61 Code re-work: HDR Joey de Vries 2017-04-23 22:43:48 +02:00
7dc79cd5fa Code re-work: parallax mapping. Joey de Vries 2017-04-23 16:30:06 +02:00
b02e4ea394 code re-work: normal mapping. Joey de Vries 2017-04-23 16:02:02 +02:00
919084ba39 Code re-work: shadow mapping. Joey de Vries 2017-04-23 12:52:47 +02:00
c8431d9498 Code re-work: point shadows. Joey de Vries 2017-04-22 20:46:55 +02:00
85530ab997 Code re-work: shadow mapping. Joey de Vries 2017-04-22 20:40:35 +02:00
33dd340549 Code re-work: gamma correction. Joey de Vries 2017-04-22 17:25:08 +02:00
cdcc3be029 Code re-work: advanced lighting. Joey de Vries 2017-04-22 17:07:31 +02:00
91dc770bc5 Code re-work: Blending. Joey de Vries 2017-04-20 22:04:34 +02:00
9994831d5d Code re-work: anti-aliasing. Joey de Vries 2017-04-20 21:30:22 +02:00
cd5f93211b Code re-work instancing. Joey de Vries 2017-04-20 21:30:07 +02:00
5693c59693 Code re-work: geometry shader. Joey de Vries 2017-04-20 00:04:02 +02:00
c763be2c08 Code re-work: Advanced OpenGL Joey de Vries 2017-04-19 22:05:36 +02:00
4b6b4d6377 Start code re-work Advanced OpenGL chapter. Joey de Vries 2017-04-17 20:40:26 +02:00
fee7580547 Update textured specular src code to new code standards. Joey de Vries 2017-04-17 15:32:01 +02:00
02784e1edf Code re-work: model loading Joey de Vries 2017-04-12 22:51:42 +02:00
d99731d752 Lighting tutorial code updates. Joey de Vries 2017-04-12 00:12:58 +02:00
4b4e0cc839 Code re-format: lighting. Joey de Vries 2017-04-10 22:08:47 +02:00
edbc854ab2 Complete code re-work 'Getting Started' tutorials. Joey de Vries 2017-04-06 21:05:54 +02:00
76de32530d Add GLAD to repository. Joey de Vries 2017-04-06 21:05:15 +02:00
c4c0588163 LearnOpenGL's header fixes. Joey de Vries 2017-04-06 21:04:47 +02:00
f11c65f673 BRDF LUT order fix. Joey de Vries 2017-04-03 21:18:57 +02:00
d6733b10db few shader updates. Joey de Vries 2017-03-31 22:39:50 +02:00