s444441/Space-Project
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.wmi.amu.edu.pl/s444441/GRK-projekt-2020

Browse Source
This commit is contained in:
Marcin Kwapisz 2021-02-04 01:53:48 +01:00
commit f2ab237a78
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grk-project.vcxproj
View File

@ -51,7 +51,7 @@
<ProjectGuid>{1B448102-E76C-4347-BDC7-40D02A567DB6}</ProjectGuid> <ProjectGuid>{1B448102-E76C-4347-BDC7-40D02A567DB6}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>grk-cw9</RootNamespace> <RootNamespace>grk-cw9</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<ProjectName>grk-project</ProjectName> <ProjectName>grk-project</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -66,7 +66,7 @@
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">

2
shaders/shader_bloom.frag
View File

@ -8,7 +8,7 @@ uniform sampler2D bloomBlur;
void main() void main()
{ {
const float gamma = 1.2; const float gamma = 1.0;
vec3 hdrColor = texture(scene, vTexCoords).rgb; vec3 hdrColor = texture(scene, vTexCoords).rgb;
vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb; vec3 bloomColor = texture(bloomBlur, vTexCoords).rgb;
hdrColor += bloomColor; hdrColor += bloomColor;

6
shaders/shader_tex.frag
View File

@ -26,7 +26,7 @@ void main()
{ {
vec3 fragColor = vec3(0,0,0); vec3 fragColor = vec3(0,0,0);
vec4 textureColor = texture2D(colorTexture, vTexCoord); vec4 textureColor = texture2D(colorTexture, vTexCoord);
vec4 ambient = vec4(0.1, 0.1, 0.1, 1.0) * textureColor; vec3 ambient = vec3(0.1, 0.1, 0.1) * textureColor.xyz;
vec3 normal = normalize(interpNormal); vec3 normal = normalize(interpNormal);
for(int i = 0; i < NR_POINT_LIGHTS; i++) for(int i = 0; i < NR_POINT_LIGHTS; i++)
{ {
@ -45,9 +45,9 @@ void main()
vec3 specular = spec * pointLights[i].color * (pointLights[i].intensity/dist); vec3 specular = spec * pointLights[i].color * (pointLights[i].intensity/dist);
vec3 texture = vec3(textureColor.x, textureColor.y, textureColor.z); // * pointLights[i].color; vec3 texture = vec3(textureColor.x, textureColor.y, textureColor.z); // * pointLights[i].color;
fragColor += mix(texture,texture*diffuse+vec3(1)*specular,0.9); fragColor += texture*diffuse+vec3(1)*specular;
} }
BrightColor = vec4(0.0, 0.0, 0.0, 1.0); BrightColor = vec4(0.0, 0.0, 0.0, 1.0);
FragColor = vec4(fragColor, 1.0) + ambient; FragColor = vec4(fragColor+ambient,1.0);
} }