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
241 Commits 2 Branches 0 Tags
d091c7b9c4ad18a0acc5d417f1566f9d337974de
Commit Graph

241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de Vries
d091c7b9c4 Add updated awesomeface.png back to repository. 2018-08-23 19:02:16 +02:00
Joey de Vries
443f16db60 Update awesomeface.png image to fix white-border artifacts. 2018-06-19 20:51:36 +02:00
Joey de Vries
cdceb36d25 Merge pull request #108 from arteniioleg/master 
fix `dl` link error
 2018-04-24 16:32:48 +02:00
xuveroleg
35271459e7 fix dl link error 
fixes https://github.com/JoeyDeVries/LearnOpenGL/issues/64
 2018-04-24 17:28:46 +03:00
Joey de Vries
9e235570f2 Merge pull request #107 from arteniioleg/master 
Build and run in docker
 2018-04-24 16:14:09 +02:00
xuveroleg
c876c7aec8 docker: enabled gpu support 2018-04-24 16:57:17 +03:00
xuveroleg
4c23c8144f created docker/ide.sh to start IDE in docker 2018-04-24 15:44:15 +03:00
xuveroleg
57e270637e initial Dockerfile with GUI libs for IDE 2018-04-24 15:43:39 +03:00
Joey de Vries
79ff6cbb68 Merge pull request #105 from keith2018/keith2018-patch-1 
fix shader file names
 2018-04-12 07:48:49 +02:00
keith2018
1a70c3efad fix shader file names 2018-04-12 10:33:41 +08:00
Joey de Vries
d0fc384f29 Merge pull request #104 from d3BugErr/master 
Another take on PBR tutorials missing rows and columns
 2018-04-10 15:51:48 +02:00
Erik
686797546a Update lighting_textured.cpp 
Real fix for missing rows and columns.
 2018-04-10 16:47:52 +03:00
Erik
ac1784f29b Update lighting.cpp 
Real fix for missing rows and columns.
 2018-04-10 16:47:20 +03:00
Joey de Vries
75648e81f6 Merge pull request #103 from d3BugErr/master 
Tutorial PBR 1.1 sphere grid construction fix
 2018-04-10 12:56:43 +02:00
d3BugErr
3eaf086897 Spheres model matrix generation fix 
Fix of integer division resulting in some spheres being rendered at same position.
Removed redundant float cast as all operands are being promoted to double anyways.
 2018-04-10 13:07:43 +03:00
Erik
e511ca603d Revert "Spheres model matrix generation fix" 
This reverts commit d702e0c6bf.
 2018-04-10 12:39:42 +03:00
d3BugErr
d702e0c6bf Spheres model matrix generation fix 
Fix of integer division resulting in some spheres being rendered at same position.
Removed redundant float cast as all operands are being promoted to double anyways.
 2018-04-10 11:23:09 +03:00
Joey de Vries
19f312b8f6 Merge pull request #102 from rarest/master 
For Xcode project: *.vs *.fs *.gs can be shown in project, changes made for shaders in project will come into effect when running
 2018-03-03 00:36:38 +01:00
Chen Shuquan
1e2bf7104c 1. add *.vs *.fs *.gs into xcode project as source file 
2. create symbolic link for *.vs *.fs *.gs: changes made in Xcode project for shader will come into effect while running the project
 2018-03-03 00:36:19 +08:00
Joey de Vries
746e751e56 Merge pull request #101 from rarest/master 
Can run with xcode project genrated by cmake client
 2018-03-01 09:40:29 +01:00
Chen Shuquan
b1ff9b1908 can run with xcode project genrated by cmake client: output binary into the same dir with resource 2018-02-28 19:48:15 +08:00
Joey de Vries
5c85f5fa20 Merge pull request #100 from klayklogg/master 
Fix a few spelling mistakes in camera.h
 2018-02-23 08:01:32 +01:00
klayklogg
498fa36396 Fix some spelling mistakes in constants, comments 2018-02-23 17:07:04 +13:00
Joey de Vries
451d772c02 Merge pull request #99 from davidstutz/master 
Fix build (using correct Assimp library) on Linux (Debian).
 2018-02-14 18:36:41 +01:00
David Stutz
0cea4ab65e Fix building, using correct assimp library path, on Linux (Debian). 2018-02-14 10:32:38 +01:00
Joey de Vries
c12bb682bf Complete build instructions Mac OS X (and typofix) 2018-02-10 10:03:24 +01:00
Joey de Vries
386dd729f3 Update ReadMe with Mac OS X instructions, issue #98. 2018-02-09 22:06:59 +01:00
Joey de Vries
eb6892ef80 Update soruce license. 2018-01-30 09:00:49 +01:00
Joey de Vries
3309ae604b Fix skybox order. 2018-01-22 19:11:11 +01:00
Joey de Vries
f9913d5aa8 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2018-01-16 08:51:04 +01:00
Joey de Vries
3b605521fb Fix geometry shader normal homogenous coordinate, and use std::string instead of aString for model loading. 2018-01-16 08:50:57 +01:00
Joey de Vries
fdb1edf760 Merge pull request #97 from sallyx/patch-1 
Added required Linux dev packages
 2017-12-06 19:37:29 +01:00
sallyx
036315579c Added required Linux dev packages 
I needed to install these packages, otherwise my build end with linkage error (-lXi misssing etc.)
 2017-12-06 19:00:02 +01:00
Joey de Vries
b1554e99a7 Merge pull request #95 from Galfatron/master 
decoupled assimp from mesh.h
 2017-11-28 12:40:04 +01:00
Galfatron
2178776423 decoupled assimp from mesh.h 2017-11-27 20:16:05 -08:00
Joey de Vries
56dfb32615 Merge pull request #93 from stfx/patch-4 
Fix another graphical error showing a black box
 2017-11-26 22:35:32 +01:00
Joey de Vries
ca3e64e17e Merge pull request #92 from stfx/patch-3 
Fix rare graphical error showing a black box
 2017-11-26 22:34:32 +01:00
stfx
b4982b4611 Fix another graphical error showing a black box 
Is needed in addition to #92 to fix all graphical errors. Happens due to divide by 0 when `roughness = 0.0` and `NdotH = 1.0`.

Also use max to clamp similar fix for specular calculation instead of addition to fix the formula in normal cases
 2017-11-26 22:10:59 +01:00
stfx
c217609890 Fix rare graphical error showing a black box 
This may happen at certain hard to replicate viewing angles.

Theoretically clamp 0,1 should also be faster since SAT (saturate) is a free operation on output however since saturate only exists on HLSL we are at the mercy of the GLSL compiler to replace clamp 0,1 with SAT. Source: http://www.humus.name/Articles/Persson_LowLevelThinking.pdf#page=22
 2017-11-26 20:03:44 +01:00
Joey de Vries
91bb8e8ca9 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2017-11-03 19:15:37 +01:00
Joey de Vries
e0edef36dd Update CMakeLists for consistent paths on Linux builds. 2017-11-03 19:12:22 +01:00
Joey de Vries
b5af4b8191 Merge pull request #87 from zlixine/master 
Much faster mesh rendering with c++11 std::to_string
 2017-10-30 08:30:43 +01:00
Zlixine
f68f84e8d9 Much faster mesh rendering with c++11 std::to_string 
Easier, Faster, More beautiful!
What do you want more.
 2017-10-30 02:10:15 +02:00
Joey de Vries
ea32df7b91 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2017-10-21 10:07:27 +02:00
Joey de Vries
d4b675bbcd Set max specular IBL reflection mip level to 4.0 to match the number of generated mips. 2017-10-21 10:07:19 +02:00
Joey de Vries
65b30bd3ed Merge pull request #85 from dotlive/master 
bug fixed & make run on macOS.
 2017-10-19 09:08:24 +02:00
dotlive
8fef6cdd3e fix shader file’s variable name dismatched with source file’s. 2017-10-19 07:30:33 +08:00
dotlive
922e127d0e fix macOS load shader failed. 2017-10-19 07:28:10 +08:00
Joey de Vries
3a04c6f9f4 Fix reflection mip level constant on PBR textured scene. 2017-09-26 19:11:01 +02:00
Joey de Vries
673fe1e89f Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2017-09-21 08:35:18 +02:00