Skip to content

GPU #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mslup wants to merge 7 commits into
base: main
Choose a base branch
from
Open

GPU #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7aa0882
Minor changes
mslup Jan 17, 2024
1a0baea
Many minor changes
mslup Jan 17, 2024
582b7d6
Minor refactoring changes again
mslup Jan 18, 2024
a9cb94c
File structure reorganized
mslup Jan 18, 2024
9848da1
File structure again
mslup Jan 18, 2024
eb6eab6
Dirty state marker
mslup Jan 18, 2024
67ba7f2
Git mishap
mslup Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions imgui.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@ Pos=60,-9
Size=400,400

[Window][Menu]
Pos=781,339
Size=173,154
Pos=-7,17
Size=276,693

[Window][Dear ImGui Demo]
Pos=329,142
Size=550,680

[Window][Dear ImGui Demo/ResizableChild_D5443E47]
IsChild=1
Size=499,136

[Window][Dear ImGui Demo/Red_1D4E05CE]
IsChild=1
Size=200,100

[Window][Menu/ChildR_46923D70]
IsChild=1
Size=260,243

[Window][Menu/Child1_92290D92]
IsChild=1
Size=246,600

[Table][0xC9935533,3]
Column 0 Weight=1.0000
Column 1 Weight=1.0000
Column 2 Weight=1.0000

[Table][0xE0773582,3]
Column 0 Weight=1.0000
Column 1 Weight=1.0000
Column 2 Weight=1.0000

51 changes: 25 additions & 26 deletions pro2.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>F:\studia\semestr 5\gpu\pro2\dependencies\include;$(IncludePath)</IncludePath>
<LibraryPath>F:\studia\semestr 5\gpu\pro2\dependencies\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)dependencies\include;$(SolutionDir)src\headers;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)dependencies\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>F:\studia\semestr 5\gpu\pro2\dependencies\include;$(IncludePath)</IncludePath>
<LibraryPath>F:\studia\semestr 5\gpu\pro2\dependencies\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)dependencies\include;$(SolutionDir)src\headers;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)dependencies\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand Down Expand Up @@ -87,13 +87,6 @@
</CudaCompile>
</ItemDefinitionGroup>
<ItemGroup>
<CudaCompile Include="cuda.cu" />
<CudaCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="application.hpp" />
<ClInclude Include="camera.hpp" />
<ClInclude Include="cuda.cuh" />
<ClInclude Include="dependencies\include\glad\glad.h" />
<ClInclude Include="dependencies\include\ImGUI\imconfig.h" />
<ClInclude Include="dependencies\include\ImGUI\imgui.h" />
Expand All @@ -105,17 +98,17 @@
<ClInclude Include="dependencies\include\ImGUI\imstb_rectpack.h" />
<ClInclude Include="dependencies\include\ImGUI\imstb_textedit.h" />
<ClInclude Include="dependencies\include\ImGUI\imstb_truetype.h" />
<ClInclude Include="framework.hpp" />
<ClInclude Include="ray.hpp" />
<ClInclude Include="renderer.hpp" />
<ClInclude Include="scene.hpp" />
<ClInclude Include="shader.hpp" />
<ClInclude Include="utils.hpp" />
<ClInclude Include="window.hpp" />
<ClInclude Include="src\headers\application.hpp" />
<ClInclude Include="src\headers\camera.hpp" />
<ClInclude Include="src\headers\cuda.cuh" />
<ClInclude Include="src\headers\framework.hpp" />
<ClInclude Include="src\headers\ray.hpp" />
<ClInclude Include="src\headers\renderer.hpp" />
<ClInclude Include="src\headers\scene.hpp" />
<ClInclude Include="src\headers\shader.hpp" />
<ClInclude Include="src\headers\window.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="application.cpp" />
<ClCompile Include="camera.cpp" />
<ClCompile Include="dependencies\include\ImGUI\imgui.cpp" />
<ClCompile Include="dependencies\include\ImGUI\imgui_demo.cpp" />
<ClCompile Include="dependencies\include\ImGUI\imgui_draw.cpp" />
Expand All @@ -124,14 +117,20 @@
<ClCompile Include="dependencies\include\ImGUI\imgui_stdlib.cpp" />
<ClCompile Include="dependencies\include\ImGUI\imgui_tables.cpp" />
<ClCompile Include="dependencies\include\ImGUI\imgui_widgets.cpp" />
<ClCompile Include="glad.c" />
<ClCompile Include="renderer.cpp" />
<ClCompile Include="scene.cpp" />
<ClCompile Include="window.cpp" />
<ClCompile Include="src\src\application.cpp" />
<ClCompile Include="src\src\camera.cpp" />
<ClCompile Include="src\src\glad.c" />
<ClCompile Include="src\src\renderer.cpp" />
<ClCompile Include="src\src\scene.cpp" />
<ClCompile Include="src\src\window.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="src\shaders\fragment.glsl" />
<None Include="src\shaders\vertex.glsl" />
</ItemGroup>
<ItemGroup>
<None Include="vertex.glsl" />
<None Include="fragment.glsl" />
<CudaCompile Include="src\src\cuda.cu" />
<CudaCompile Include="src\src\main.cu" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
47 changes: 22 additions & 25 deletions pro2.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<CudaCompile Include="cuda.cu">
<ItemGroup>
<CudaCompile Include="src\src\cuda.cu">
<Filter>Source</Filter>
</CudaCompile>
<CudaCompile Include="main.cpp">
<CudaCompile Include="src\src\main.cpp">
<Filter>Source</Filter>
</CudaCompile>
</ItemGroup>
Expand Down Expand Up @@ -39,39 +39,36 @@
<ClInclude Include="dependencies\include\ImGUI\imconfig.h">
<Filter>Include\ImGUI</Filter>
</ClInclude>
<ClInclude Include="application.hpp">
<Filter>Headers</Filter>
<ClInclude Include="dependencies\include\glad\glad.h">
<Filter>Include\GLAD</Filter>
</ClInclude>
<ClInclude Include="framework.hpp">
<ClInclude Include="src\headers\application.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="camera.hpp">
<ClInclude Include="src\headers\camera.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="cuda.cuh">
<ClInclude Include="src\headers\cuda.cuh">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="ray.hpp">
<ClInclude Include="src\headers\framework.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="renderer.hpp">
<ClInclude Include="src\headers\ray.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="scene.hpp">
<ClInclude Include="src\headers\renderer.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="shader.hpp">
<ClInclude Include="src\headers\scene.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="utils.hpp">
<ClInclude Include="src\headers\shader.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="window.hpp">
<ClInclude Include="src\headers\window.hpp">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="dependencies\include\glad\glad.h">
<Filter>Include\GLAD</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Headers">
Expand Down Expand Up @@ -118,30 +115,30 @@
<ClCompile Include="dependencies\include\ImGUI\imgui_widgets.cpp">
<Filter>Include\ImGUI</Filter>
</ClCompile>
<ClCompile Include="glad.c">
<ClCompile Include="src\src\glad.c">
<Filter>Include\GLAD</Filter>
</ClCompile>
<ClCompile Include="application.cpp">
<ClCompile Include="src\src\application.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="camera.cpp">
<ClCompile Include="src\src\camera.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="renderer.cpp">
<ClCompile Include="src\src\renderer.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="window.cpp">
<ClCompile Include="src\src\scene.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="scene.cpp">
<ClCompile Include="src\src\window.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="vertex.glsl">
<None Include="src\shaders\fragment.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="fragment.glsl">
<None Include="src\shaders\vertex.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
Expand Down
12 changes: 0 additions & 12 deletions scene.cpp
View file
Open in desktop

This file was deleted.

151 changes: 0 additions & 151 deletions scene.hpp
View file
Open in desktop

This file was deleted.

Loading