Skip to content

Commit d8ad0c2

Browse files
russkevrusskev
committed
Updated readme, put stl etc. in pch.h
1 parent 4c56067 commit d8ad0c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+259
-353
lines changed

‎src/gl_demo/gl_demo.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
#include "scenes/DeferredRenderDemo.h"
44
#include "scenes/ShaderBallHD.h"
55
#include "scenes/SkyBoxDemo.h"
6+
#include "scenes/FirstScene.h"
67

78
#undef main
89
int main(int argc, char* args[])
910
{
10-
//gl_demo::deferred_demo();
11+
gl_demo::first_scene();
1112

12-
//gl_demo::ShaderBallHD hd_demo;
13-
//hd_demo.demo_01();
14-
//hd_demo.demo_02();
15-
//hd_demo.demo_03();
16-
//hd_demo.demo_04();
17-
//hd_demo.demo_05();
18-
//hd_demo.demo_06();
13+
gl_demo::deferred_demo();
14+
gl_demo::ShaderBallHD hd_demo;
15+
hd_demo.demo_01();
16+
hd_demo.demo_02();
17+
hd_demo.demo_03();
18+
hd_demo.demo_04();
19+
hd_demo.demo_05();
20+
hd_demo.demo_06();
1921

2022
gl_demo::skybox_demo();
2123
return 0;

‎src/gl_demo/gl_demo.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
</ItemGroup>
175175
<ItemGroup>
176176
<ClInclude Include="scenes\DeferredRenderDemo.h" />
177+
<ClInclude Include="scenes\FirstScene.h" />
177178
<ClInclude Include="scenes\ShaderBallHD.h" />
178179
<ClInclude Include="scenes\SkyBoxDemo.h" />
179180
</ItemGroup>

‎src/gl_demo/gl_demo.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<ClInclude Include="scenes\SkyBoxDemo.h">
2828
<Filter>Scenes</Filter>
2929
</ClInclude>
30+
<ClInclude Include="scenes\FirstScene.h">
31+
<Filter>Scenes</Filter>
32+
</ClInclude>
3033
</ItemGroup>
3134
<ItemGroup>
3235
<None Include="packages.config" />

‎src/gl_demo/scenes/FirstScene.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#pragma once
2+
3+
#include "gl_engine.h"
4+
5+
namespace gl_demo
6+
{
7+
static void first_scene()
8+
{
9+
// Set up the Window
10+
GLuint width = 800u;
11+
GLuint height = 600u;
12+
glen::Window window{ "First Window", width, height };
13+
14+
// Set up the camera
15+
glen::TargetCamera targetCam{};
16+
glen::CameraNode targetCam_node{ "Target Camera", &targetCam };
17+
targetCam.set_position({ 0.0f, 3.0f, 5.0f });
18+
targetCam.focus({ 0.0f, 0.0f, 0.0f });
19+
20+
// Set up the sphere model
21+
glen::Mesh sphere_mesh{ glen::Sphere::create_sphere(1.0f) };
22+
glen::BlinnMaterial blinn_white{ "White Blinn" };
23+
blinn_white.set_sampler_value(blinn_white.k_material_diffuse, 0.5f);
24+
glen::MeshNode sphere_mesh_node{ "Sphere Node", &sphere_mesh, &blinn_white };
25+
sphere_mesh_node.set_position({ 0.0f, 1.0f, 0.0f });
26+
27+
//Set up a ground plane
28+
glen::Mesh ground{ glen::Plane::create_plane(5.0f, 5.0f) };
29+
glen::MeshNode ground_node{ "Ground Plane Node", &ground, &blinn_white };
30+
31+
// Set up the light
32+
glen::PointLight light;
33+
glen::LightNode light_node{ "Main Light Node", &light };
34+
light_node.set_position({ 5.0f, 6.0f, 0.0f });
35+
light.set_brightness(5.0f);
36+
37+
// Set up shadow map
38+
glen::ShadowMap shadow{ &light_node, 2048 };
39+
shadow.set_bias(0.2f);
40+
shadow.set_clip_far(40);
41+
42+
// Set up the renderer
43+
glen::Renderer renderer{ &targetCam_node, glm::uvec2{ width, height } };
44+
45+
// Add the nodes
46+
renderer.add_node(&sphere_mesh_node);
47+
renderer.add_node(&ground_node);
48+
renderer.add_node(&light_node);
49+
renderer.enable_ao(); //Turn on ambient occlusion
50+
51+
// Set up the timer and window
52+
glen::Timer timer;
53+
54+
// Main render loop
55+
while (renderer.poll_events())
56+
{
57+
renderer.update(&window, &timer);
58+
}
59+
}
60+
}

‎src/gl_engine/camera/Camera.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
#ifndef GL_ENGINE_CAMERA_CAMERA_H
22
#define GL_ENGINE_CAMERA_CAMERA_H
33

4-
#define SDL_MAIN_HANDLED
5-
#include <SDL.h>
6-
#undef main
7-
#include <GL/glew.h>
8-
#include <glm/glm.hpp>
4+
#include "pch.h"
95

106
namespace glen
117
{
@@ -48,7 +44,7 @@ namespace glen
4844
private:
4945
glm::uvec2 m_dimensions = { 800u, 600u };
5046
GLfloat m_clip_near = 0.1f;
51-
GLfloat m_clip_far = 10.0f;
47+
GLfloat m_clip_far = 1000.0f;
5248

5349
glm::mat4 m_default_transform = glm::mat4{ 1.0f };
5450
glm::mat4* m_parent_transform = &m_default_transform;

‎src/gl_engine/camera/FreeCamera.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "pch.h"
2-
#include "FreeCamera.h"
3-
4-
#include <glm/gtc/matrix_transform.hpp>
52

3+
#include "FreeCamera.h"
64
#include "utils/VectorUtils.h"
75

86

‎src/gl_engine/camera/OrthoCamera.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#include "pch.h"
2-
#include "OrthoCamera.h"
3-
4-
#include <glm/glm.hpp>
5-
#include <glm/gtc/matrix_transform.hpp>
62

3+
#include "OrthoCamera.h"
74
#include "utils/VectorUtils.h"
85

96
namespace glen

‎src/gl_engine/camera/TargetCamera.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
#include "pch.h"
22
#include "TargetCamera.h"
33

4-
#include <iostream>
5-
6-
#include <glm/gtc/matrix_transform.hpp>
7-
#define GLM_ENABLE_EXPERIMENTAL
8-
#include <glm/gtx/quaternion.hpp>
9-
#include <glm/gtx/matrix_decompose.hpp>
10-
#include <glm/gtx/euler_angles.hpp>
11-
124
#include "utils/VectorUtils.h"
135

146

‎src/gl_engine/gl_engine.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#include "pch.h"
22
#include "framework.h"
33

4-
#include <iostream>
5-
#include <vector>
6-
74
#include "mesh/Mesh.h"
85
#include "mesh/Cube.h"
96
#include "mesh/Cylinder.h"

‎src/gl_engine/gl_engine.vcxproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -257,32 +257,32 @@
257257
<ClCompile Include="utils\VectorUtils.cpp" />
258258
</ItemGroup>
259259
<ItemGroup>
260-
<None Include="..\assets\shaders\AO.frag" />
261-
<None Include="..\assets\shaders\AO_Blur.frag" />
262-
<None Include="..\assets\shaders\AO_GBuffer.frag" />
263-
<None Include="..\assets\shaders\AO_GBuffer.vert" />
264-
<None Include="..\assets\shaders\Blinn.frag" />
265-
<None Include="..\assets\shaders\Blinn.vert" />
266-
<None Include="..\assets\shaders\BlinnDeferred.frag" />
267-
<None Include="..\assets\shaders\Bloom.frag" />
268-
<None Include="..\assets\shaders\Composite.frag" />
269-
<None Include="..\assets\shaders\Depth.frag" />
270-
<None Include="..\assets\shaders\Depth.vert" />
271-
<None Include="..\assets\shaders\DepthCube.frag" />
272-
<None Include="..\assets\shaders\DepthCube.geom" />
273-
<None Include="..\assets\shaders\DepthCube.vert" />
274-
<None Include="..\assets\shaders\GaussianBlur.frag" />
275-
<None Include="..\assets\shaders\GBuffer.frag" />
276-
<None Include="..\assets\shaders\GBuffer.vert" />
277-
<None Include="..\assets\shaders\HDR.frag" />
278-
<None Include="..\assets\shaders\Light.frag" />
279-
<None Include="..\assets\shaders\Light.vert" />
280-
<None Include="..\assets\shaders\Passthrough.vert" />
281-
<None Include="..\assets\shaders\ScreenPassthrough.vert" />
282-
<None Include="..\assets\shaders\Skybox.frag" />
283-
<None Include="..\assets\shaders\Skybox.vert" />
284-
<None Include="..\assets\shaders\Text2D.frag" />
285-
<None Include="..\assets\shaders\Text2D.vert" />
260+
<None Include="..\..\assets\shaders\AO.frag" />
261+
<None Include="..\..\assets\shaders\AO_Blur.frag" />
262+
<None Include="..\..\assets\shaders\AO_GBuffer.frag" />
263+
<None Include="..\..\assets\shaders\AO_GBuffer.vert" />
264+
<None Include="..\..\assets\shaders\Blinn.frag" />
265+
<None Include="..\..\assets\shaders\Blinn.vert" />
266+
<None Include="..\..\assets\shaders\BlinnDeferred.frag" />
267+
<None Include="..\..\assets\shaders\Bloom.frag" />
268+
<None Include="..\..\assets\shaders\Composite.frag" />
269+
<None Include="..\..\assets\shaders\Depth.frag" />
270+
<None Include="..\..\assets\shaders\Depth.vert" />
271+
<None Include="..\..\assets\shaders\DepthCube.frag" />
272+
<None Include="..\..\assets\shaders\DepthCube.geom" />
273+
<None Include="..\..\assets\shaders\DepthCube.vert" />
274+
<None Include="..\..\assets\shaders\GaussianBlur.frag" />
275+
<None Include="..\..\assets\shaders\GBuffer.frag" />
276+
<None Include="..\..\assets\shaders\GBuffer.vert" />
277+
<None Include="..\..\assets\shaders\HDR.frag" />
278+
<None Include="..\..\assets\shaders\Light.frag" />
279+
<None Include="..\..\assets\shaders\Light.vert" />
280+
<None Include="..\..\assets\shaders\Passthrough.vert" />
281+
<None Include="..\..\assets\shaders\ScreenPassthrough.vert" />
282+
<None Include="..\..\assets\shaders\Skybox.frag" />
283+
<None Include="..\..\assets\shaders\Skybox.vert" />
284+
<None Include="..\..\assets\shaders\Text2D.frag" />
285+
<None Include="..\..\assets\shaders\Text2D.vert" />
286286
<None Include="packages.config" />
287287
</ItemGroup>
288288
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)