213 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Joey de Vries	2e0035a8d4	fix: use radians instead of degrees for camera zoom.	2017-09-21 08:35:13 +02:00
Joey de Vries	9952702741	Merge pull request #81 from stfx/patch-2 ... Fix Bloom in rare cases	2017-09-11 08:45:32 +02:00
Joey de Vries	a27923630b	Merge pull request #83 from lostplesed/patch-1 ... fix mac build failed	2017-08-29 09:15:53 +02:00
lost plesed	0cb58d04ba	fix mac build failed ... #82	2017-08-29 11:47:04 +08:00
stfx	33ee64327f	Fix typo	2017-08-19 16:59:35 +02:00
stfx	dc4dee3f82	Fix Bloom in rare cases ... BloomColor was not initialized with a value and therefore could incorrectly bloom non-bright pixels. Maybe... since the issue randomly started to happen on my system (i5-4570, GTX 760) without any hardware or software changes I know of. Even older versions of my program then suddenly had this problem and this was the only working fix which was mentioned in the comments section on the tutorial: https://learnopengl.com/#!Advanced-Lighting/Bloom#comment-2693931521)	2017-08-19 16:57:49 +02:00
Joey de Vries	c6b404915d	Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL	2017-07-24 20:08:58 +02:00
Joey de Vries	b379c0fe74	Additional statements to clarify usage of FileSystem namespace in Textures tutorial.	2017-07-24 20:08:53 +02:00
Joey de Vries	d2c0775928	Merge pull request #77 from shivmsit/osx_cmake_fix ... Add glfw hint for GLFW_OPENGL_FORWARD_COMPAT for more samples to let it	2017-07-12 18:13:40 +02:00
Shivpratap Chauhan	b5848894eb	Add glfw hint for GLFW_OPENGL_FORWARD_COMPAT for more samples to let it ... work on osx	2017-07-12 21:33:07 +05:30
Joey de Vries	c591154e15	Merge pull request #76 from shivmsit/osx_cmake_fix ... GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx	2017-07-12 13:50:45 +02:00
Shivpratap Chauhan	2d16ef0fe2	GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx to create glfw ... window successfully	2017-07-12 17:06:00 +05:30
Joey de Vries	18197233c7	Merge pull request #75 from shivmsit/osx_cmake_fix ... osx cmake build fixes.	2017-07-11 21:54:12 +02:00
Shivpratap Chauhan	95598f250a	osx cmake build fixes.	2017-07-12 00:45:06 +05:30
Joey de Vries	effe69f83d	Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL	2017-07-10 08:37:02 +02:00
Joey de Vries	103b4f6358	Coordinate system code fix.	2017-07-10 08:36:52 +02:00
Joey de Vries	8f66784a79	Merge pull request #73 from d3BugErr/master ... Changed MSVC std::sqrtf call to simple std::sqrt on MinGW toolchain	2017-07-04 13:40:25 +02:00
Erik	c4c5fea218	Changed MSVC std::sqrtf call to simple std::sqrt - causes compile failure on mingw toolchain, as no such fucntion is present.	2017-07-04 13:40:47 +03:00
Joey de Vries	f3bda045c1	Merge pull request #71 from tielei/minor_fix ... fix texture1 uniform name & two shader variables	2017-06-29 17:32:50 +02:00
Charles Zhang	e7382fdfb0	fix texture1 uniform name & two shader variables	2017-06-29 18:37:08 +08:00
Joey de Vries	905be9ce52	Use appropriate texture fs name on setting uniform.	2017-06-29 08:38:48 +02:00
Joey de Vries	d67d69712d	Merge pull request #70 from tielei/minor_fix ... Variable name does not match with that in frag shader	2017-06-29 08:36:02 +02:00
Charles Zhang	ecc7e7ca92	Variable name does not match with that in frag shader	2017-06-29 14:32:27 +08:00
Joey de Vries	1e2398e92b	Add license file, code to public domain.	2017-06-29 08:12:50 +02:00
Joey de Vries	4bd8846929	Merge pull request #61 from amesgames/master ... Fixed stencil testing sample to actually set the uniform matrices on …	2017-06-29 08:10:14 +02:00
Joey de Vries	aa22112332	Merge pull request #68 from 64/master ... Fix more errors on OSX	2017-06-18 23:20:47 +02:00
Matthew Taylor	4a94fbf2bf	Add commented out code to allow window creation on OSX	2017-06-18 01:53:16 +01:00
Joey de Vries	8ffb45834b	Merge pull request #67 from 64/master ... Fix OSX errors and warnings	2017-06-18 01:54:02 +02:00