Kaweees · ADUSTEC · Nov 19, 2024
diff --git a/.gitignore b/.gitignore
@@ -65,4 +65,8 @@ CMakeSettings.json
 # Build files
 .cache/
 target/
-build/
+build/
+bin/
+bin-int/
+.vs/
+README.md.backup
diff --git a/.premakebin/LICENSE.txt b/.premakebin/LICENSE.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2003-2022 Jason Perkins and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+
+  3. Neither the name of Premake nor the names of its contributors may be
+     used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,10 +41,10 @@ if(NOT CUDA_FOUND AND APPLE)
 endif()
 
 # Adding our source files
-file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/src/*.c" "${CMAKE_CURRENT_LIST_DIR}/src/*.cpp" "${CMAKE_CURRENT_LIST_DIR}/src/*.cc" "${CMAKE_CURRENT_LIST_DIR}/src/*.cxx" "${CMAKE_CURRENT_LIST_DIR}/src/*.cu") # Define PROJECT_SOURCES as a list of all source files
+file(GLOB_RECURSE PROJECT_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/kiwi/src/*.c" "${CMAKE_CURRENT_LIST_DIR}/kiwi/src/*.cpp" "${CMAKE_CURRENT_LIST_DIR}/kiwi/*.cpp" "${CMAKE_CURRENT_LIST_DIR}/kiwi/src/*.cxx" "${CMAKE_CURRENT_LIST_DIR}/kiwi/src/*.cu") # Define PROJECT_SOURCES as a list of all source files
 target_sources(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCES})
 # Adding our include files
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/kiwi/include)
 
 # Setting ASSETS_PATH
 target_compile_definitions(${PROJECT_NAME} PUBLIC ASSETS_PATH="${CMAKE_CURRENT_SOURCE_DIR}/assets/") # Set the asset path macro to the absolute path on the dev machine

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ A three-dimensional graphics library from scratch written in C++13 and accelerat
 
 ### Prerequisites
 
-Before attempting to build this project, make sure you have [Simple DirectMedia Layer (SDL 2)](https://wiki.libsdl.org/SDL2/Installation), [GNU Make](https://www.gnu.org/software/make/), and [CMake](https://cmake.org) installed on your machine.
+Before attempting to build this project, make sure you have [Simple DirectMedia Layer (SDL 2)](https://wiki.libsdl.org/SDL2/Installation), [GNU Make](https://www.gnu.org/software/make/), and [CMake](https://cmake.org) installed on your machine, unless you are on windows then everything should be provided in the project.
 
 
 ### Installation
@@ -69,7 +69,11 @@ To get a local copy of the project up and running on your machine, follow these
 
 2. Build and execute the project
    ```sh
+   --- With cmake
    clear && cmake CMakeLists.txt && make && ./target/release/kiwigl
+
+   --- With premake
+   run build.bat and open the generated project
    ```
 
 ## Usage
@@ -107,13 +111,16 @@ To interact with the graphics library, use the following keyboard shortcuts:
 
 ```sh
 graphics/
-├── .github/                       - GitHub Actions CI/CD workflows
-├── include/                       - project header files
-├── src/                           - project source files
-│   └── main.c                     - Entry point, main function
-├── CMakeLists.txt                 - CMake build script
-├── LICENSE                        - project license
-└── README.md                      - you are here
+├──── .github/                       - GitHub Actions CI/CD workflows
+├──── kiwi/                          - All project files
+│   └── include/                     - Project header files
+│   └── src/                         - Project source files
+│   └── main.cpp                     - Entry point, main function
+├──── vendor/                        - Libraries used with premake building
+├──── CMakeLists.txt                 - CMake build script
+├──── premake5.lua                   - Premake build script
+├──── LICENSE                        - Project license
+└──── README.md                      - You are here!
 ```
 
 ## License

diff --git a/build.bat b/build.bat
@@ -0,0 +1,2 @@
+call .premakebin\premake5.exe vs2022
+PAUSE
diff --git a/include/color.hpp → kiwi/include/color.hpp b/include/color.hpp → kiwi/include/color.hpp
diff --git a/include/constants.hpp → kiwi/include/constants.hpp b/include/constants.hpp → kiwi/include/constants.hpp
diff --git a/include/display.cuh → kiwi/include/display.cuh b/include/display.cuh → kiwi/include/display.cuh
diff --git a/include/display.hpp → kiwi/include/display.hpp b/include/display.hpp → kiwi/include/display.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/include/display.metal → kiwi/include/display.metal b/include/display.metal → kiwi/include/display.metal
diff --git a/include/face.hpp → kiwi/include/face.hpp b/include/face.hpp → kiwi/include/face.hpp
diff --git a/include/frame_buffer.hpp → kiwi/include/frame_buffer.hpp b/include/frame_buffer.hpp → kiwi/include/frame_buffer.hpp
diff --git a/include/mesh.hpp → kiwi/include/mesh.hpp b/include/mesh.hpp → kiwi/include/mesh.hpp
diff --git a/include/texture.hpp → kiwi/include/texture.hpp b/include/texture.hpp → kiwi/include/texture.hpp
diff --git a/include/triangle.hpp → kiwi/include/triangle.hpp b/include/triangle.hpp → kiwi/include/triangle.hpp
diff --git a/include/vector2d.hpp → kiwi/include/vector2d.hpp b/include/vector2d.hpp → kiwi/include/vector2d.hpp
diff --git a/include/vector3d.hpp → kiwi/include/vector3d.hpp b/include/vector3d.hpp → kiwi/include/vector3d.hpp
diff --git a/kiwi/kiwi.vcxproj b/kiwi/kiwi.vcxproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{798A997C-65C1-9A0D-0EAE-8010FAC3160F}</ProjectGuid>
+    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>kiwi</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\bin\Debug-windows-x86_64\kiwi\</OutDir>
+    <IntDir>..\bin-int\Debug-windows-x86_64\kiwi\</IntDir>
+    <TargetName>kiwi</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\bin\Release-windows-x86_64\kiwi\</OutDir>
+    <IntDir>..\bin-int\Release-windows-x86_64\kiwi\</IntDir>
+    <TargetName>kiwi</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>..\vendor\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <ExternalWarningLevel>Level3</ExternalWarningLevel>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2test.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\vendor\SDL2\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /B /Y ..\vendor\SDL2\lib\x64\SDL2.dll ..\bin\Debug-windows-x86_64\kiwi
+IF NOT EXIST ..\bin\Debug-windows-x86_64\kiwi\assets (mkdir ..\bin\Debug-windows-x86_64\kiwi\assets)
+xcopy /Q /E /Y /I ..\assets ..\bin\Debug-windows-x86_64\kiwi\assets</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>..\vendor\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <ExternalWarningLevel>Level3</ExternalWarningLevel>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2test.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\vendor\SDL2\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy /B /Y ..\vendor\SDL2\lib\x64\SDL2.dll ..\bin\Release-windows-x86_64\kiwi
+IF NOT EXIST ..\bin\Release-windows-x86_64\kiwi\assets (mkdir ..\bin\Release-windows-x86_64\kiwi\assets)
+xcopy /Q /E /Y /I ..\assets ..\bin\Release-windows-x86_64\kiwi\assets</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="include\color.hpp" />
+    <ClInclude Include="include\constants.hpp" />
+    <ClInclude Include="include\display.hpp" />
+    <ClInclude Include="include\face.hpp" />
+    <ClInclude Include="include\frame_buffer.hpp" />
+    <ClInclude Include="include\mesh.hpp" />
+    <ClInclude Include="include\texture.hpp" />
+    <ClInclude Include="include\triangle.hpp" />
+    <ClInclude Include="include\vector2d.hpp" />
+    <ClInclude Include="include\vector3d.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="src\color.cpp" />
+    <ClCompile Include="src\display.cpp" />
+    <ClCompile Include="src\face.cpp" />
+    <ClCompile Include="src\frame_buffer.cpp" />
+    <ClCompile Include="src\mesh.cpp" />
+    <ClCompile Include="src\texture.cpp" />
+    <ClCompile Include="src\trangle.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/kiwi/kiwi.vcxproj.filters b/kiwi/kiwi.vcxproj.filters
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\color.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\constants.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\display.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\face.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\frame_buffer.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\mesh.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\texture.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\triangle.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\vector2d.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="include\vector3d.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="src\color.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\display.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\face.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\frame_buffer.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mesh.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\texture.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\trangle.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/kiwi/kiwi.vcxproj.user b/kiwi/kiwi.vcxproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+</Project>
diff --git a/src/main.cpp → kiwi/main.cpp b/src/main.cpp → kiwi/main.cpp
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "../include/display.hpp"
+#include "../kiwi/include/display.hpp"
 
 #ifdef USE_METAL
 #include <cassert>

diff --git a/src/color.cpp → kiwi/src/color.cpp b/src/color.cpp → kiwi/src/color.cpp
diff --git a/src/display.cpp → kiwi/src/display.cpp b/src/display.cpp → kiwi/src/display.cpp
@@ -9,7 +9,7 @@
 #include "../include/display.metal"
 #endif
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <string>
 

diff --git a/src/display.cu → kiwi/src/display.cu b/src/display.cu → kiwi/src/display.cu
diff --git a/src/face.cpp → kiwi/src/face.cpp b/src/face.cpp → kiwi/src/face.cpp
diff --git a/src/frame_buffer.cpp → kiwi/src/frame_buffer.cpp b/src/frame_buffer.cpp → kiwi/src/frame_buffer.cpp
diff --git a/src/mesh.cpp → kiwi/src/mesh.cpp b/src/mesh.cpp → kiwi/src/mesh.cpp
diff --git a/src/texture.cpp → kiwi/src/texture.cpp b/src/texture.cpp → kiwi/src/texture.cpp
diff --git a/src/trangle.cpp → kiwi/src/trangle.cpp b/src/trangle.cpp → kiwi/src/trangle.cpp
diff --git a/kiwiGL.sln b/kiwiGL.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwi", "kiwi\kiwi.vcxproj", "{798A997C-65C1-9A0D-0EAE-8010FAC3160F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{798A997C-65C1-9A0D-0EAE-8010FAC3160F}.Debug|x64.ActiveCfg = Debug|x64
+		{798A997C-65C1-9A0D-0EAE-8010FAC3160F}.Debug|x64.Build.0 = Debug|x64
+		{798A997C-65C1-9A0D-0EAE-8010FAC3160F}.Release|x64.ActiveCfg = Release|x64
+		{798A997C-65C1-9A0D-0EAE-8010FAC3160F}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal