Skip to content

Commit a73da94

Browse files
HaydenD100HaydenD100
committed
Multiple Lights as well as cleaning up
1 parent e058488 commit a73da94

55 files changed

Lines changed: 132418 additions & 114 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ StyleCopReport.xml
7878
*_h.h
7979
*.ilk
8080
*.meta
81-
*.obj
8281
*.iobj
8382
*.pch
8483
*.pdb

‎3dEngine2.0.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
<ClCompile Include="Engine\Loaders\vboindexer.cpp" />
172172
<ClCompile Include="Engine\Physics\BulletPhysics.cpp" />
173173
<ClCompile Include="Engine\Physics\Physics.cpp" />
174+
<ClCompile Include="Engine\Core\Lights\light.cpp" />
174175
<ClCompile Include="main.cpp" />
175176
</ItemGroup>
176177
<ItemGroup>
@@ -220,6 +221,7 @@
220221
<ClInclude Include="Engine\Loaders\vboindexer.h" />
221222
<ClInclude Include="Engine\Physics\BulletPhysics.h" />
222223
<ClInclude Include="Engine\Physics\Physics.h" />
224+
<ClInclude Include="Engine\Core\Lights\light.h" />
223225
</ItemGroup>
224226
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
225227
<ImportGroup Label="ExtensionTargets">

‎3dEngine2.0.vcxproj.filters‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
<ClCompile Include="Engine\Debug\DebugDrawer.cpp">
9797
<Filter>Source Files</Filter>
9898
</ClCompile>
99+
<ClCompile Include="Engine\Core\Lights\light.cpp">
100+
<Filter>Source Files</Filter>
101+
</ClCompile>
99102
</ItemGroup>
100103
<ItemGroup>
101104
<ClInclude Include="Engine\Core\Scene\Scene.h">
@@ -158,6 +161,36 @@
158161
<ClInclude Include="Engine\Debug\DebugDrawer.h">
159162
<Filter>Header Files</Filter>
160163
</ClInclude>
164+
<ClInclude Include="Engine\Core\AssetManager.h">
165+
<Filter>Header Files</Filter>
166+
</ClInclude>
167+
<ClInclude Include="Engine\Core\Common.h">
168+
<Filter>Header Files</Filter>
169+
</ClInclude>
170+
<ClInclude Include="Engine\Core\GameObject.h">
171+
<Filter>Header Files</Filter>
172+
</ClInclude>
173+
<ClInclude Include="Engine\Core\Renderer.h">
174+
<Filter>Header Files</Filter>
175+
</ClInclude>
176+
<ClInclude Include="Engine\Core\shader_s.h">
177+
<Filter>Header Files</Filter>
178+
</ClInclude>
179+
<ClInclude Include="Engine\Loaders\loader.hpp">
180+
<Filter>Header Files</Filter>
181+
</ClInclude>
182+
<ClInclude Include="Engine\Loaders\ShaderLoader.hpp">
183+
<Filter>Header Files</Filter>
184+
</ClInclude>
185+
<ClInclude Include="Engine\Loaders\stb_image.h">
186+
<Filter>Header Files</Filter>
187+
</ClInclude>
188+
<ClInclude Include="Engine\Loaders\vboindexer.h">
189+
<Filter>Header Files</Filter>
190+
</ClInclude>
191+
<ClInclude Include="Engine\Core\Lights\light.h">
192+
<Filter>Header Files</Filter>
193+
</ClInclude>
161194
</ItemGroup>
162195
<ItemGroup>
163196
<None Include="Assets\Shaders\SkyBoxShader.vert" />

‎Assets/Objects/BulletHole.obj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Blender 4.1.1
2+
# www.blender.org
3+
mtllib untitled.mtl
4+
o Plane
5+
v 0.000000 1.000000 1.000000
6+
v -0.000000 -1.000000 1.000000
7+
v 0.000000 1.000000 -1.000000
8+
v -0.000000 -1.000000 -1.000000
9+
vn 1.0000 -0.0000 -0.0000
10+
vt 1.000000 0.000000
11+
vt 0.000000 1.000000
12+
vt 0.000000 0.000000
13+
vt 1.000000 1.000000
14+
s 0
15+
f 2/1/1 3/2/1 1/3/1
16+
f 2/1/1 4/4/1 3/2/1

0 commit comments

Comments
 (0)