Skip to content
Snippets Groups Projects
Commit 42985de3 authored by 백상수's avatar 백상수
Browse files
parents d0fd92f5 8c99b35e
Branches
No related tags found
No related merge requests found
......@@ -123,6 +123,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="FileSystem.cpp" />
<ClCompile Include="Light.cpp" />
<ClCompile Include="Logger.cpp" />
<ClCompile Include="ResourceLoader.cpp" />
<ClCompile Include="OpenGLWrapper.cpp" />
......@@ -132,9 +133,11 @@
<ItemGroup>
<ClInclude Include="Camera.h" />
<ClInclude Include="FileSystem.h" />
<ClInclude Include="Light.h" />
<ClInclude Include="Logger.h" />
<ClInclude Include="ResourceLoader.h" />
<ClInclude Include="OpenGLWrapper.h" />
<ClInclude Include="Scene.h" />
<ClInclude Include="ShaderType.h" />
<ClInclude Include="Transform.h" />
</ItemGroup>
......
......@@ -33,6 +33,9 @@
<ClCompile Include="Transform.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Light.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ShaderType.h">
......@@ -56,5 +59,11 @@
<ClInclude Include="Transform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Scene.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Light.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
#include "Light.h"
Light::Light(glm::vec3 _ambient, glm::vec3 _diffuse, glm::vec3 _specular)
{
ambient = _ambient;
diffuse = _diffuse;
specular = _specular;
}
Transform *Light::get_transform()
{
return &transform;
}
glm::vec3 DirectionalLight::get_light_direction()
{
return get_transform()->get_front();
}
\ No newline at end of file
#pragma once
#include <GL/glew.h>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include "Transform.h"
class Light
{
private:
Transform transform;
public:
Light(glm::vec3 _ambient, glm::vec3 _diffuse, glm::vec3 _specular);
Transform *get_transform();
glm::vec3 ambient;
glm::vec3 diffuse;
glm::vec3 specular;
};
class DirectionalLight : Light
{
public:
glm::vec3 get_light_direction();
};
\ No newline at end of file
#pragma once
class Scene
{
};
\ No newline at end of file
......@@ -53,6 +53,11 @@ void main (void)
vec2 finalCoords = ProjTexCoords.st / ProjTexCoords.q;
vec4 ProjMapColor_forCam1 = texture(projImage, finalCoords);
projColor = ProjMapColor_forCam1;
if(ProjMapColor_forCam1.a < 1.0)
{
projColor = result;
}
}
FragColor = mix(result, projColor, 0.4f);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment