ilusha/MA-software-rendering
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compilation of the legend

Browse source
This commit is contained in:
IlyaShurupov 2022-03-27 19:06:34 +03:00
parent eec6cc54a0
commit 4b3cbdf9a4
22 changed files with 103 additions and 6500 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Sourse/Data/Data.vcxproj
View file

@ -29,26 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
@ -96,7 +96,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\extern\include;$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;$(SolutionDir)..\glfw\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -111,7 +111,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\extern\include;$(SolutionDir)\DataStruct\sourse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;$(SolutionDir)..\glfw\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -128,7 +128,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\extern\include;$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;$(SolutionDir)..\glfw\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -147,7 +147,7 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\extern\include;$(SolutionDir)\DataStruct\sourse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)\DataStruct\sourse;$(SolutionDir)\Sourse\Math\sourse;$(SolutionDir)\Sourse\Data\sourse\mesh;$(SolutionDir)\Sourse\Data\sourse\primitives;$(SolutionDir)\Sourse\Data\sourse\objects;$(SolutionDir)..\glfw\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

4
Sourse/Data/sourse/Data.h
View file

@ -5,7 +5,7 @@
#include "primitives/timer.h"
#include "primitives/ray.h"
#include "RND_engine.h"
#include <GLFW/glfw3.h> // Get rid of this some time
#include "GLFW/glfw3.h" // Get rid of this some time
// ------------------Struct Data------------------------ //
@ -85,3 +85,5 @@ struct _Data
_DA_MeshObjects DA_MeshObjects;
_Light Light;
};
extern _Data* Data_p;

3
Sourse/Data/sourse/objects/DT_Object.cpp
View file

@ -1,5 +1,5 @@
#include "DT_Object.h"
#include "Math.h"
#include "MaMath.h"
// ---------------- _DAI_ -------------------- //
@ -54,7 +54,6 @@ _DAI_Object::_DAI_Object(char Objname, _DAI_Object* lastItem, int i)
void _DAI_Object::rot(vec3f* axs_dir, vec3f* axs_pos, float angle)
{
printf("");
for (int i = 0; i < 3; i++) {
(&unit_vx)[i] += Position;
vec3f* vec = &(&unit_vx)[i];

2
Sourse/Data/sourse/primitives/ray.cpp
View file

@ -1,5 +1,5 @@
#include "ray.h"
#include "Math.h"
#include "MaMath.h"

2
Sourse/Data/sourse/primitives/vec3f.cpp
View file

@ -1,5 +1,5 @@
#include "vec3f.h"
#include "MAth.h"
#include "MaMAth.h"
vec3f& vec3f::operator*=(float val)
{