Commit 73af37ca authored by Baldur Paulwitz's avatar Baldur Paulwitz

update

- completely redone project
- clean up -> better object oriented programming
- shaders (also compute) work
- quad works
- texture works
- set resizable false, becouse reconfiguring the texture is annoying
parent c6369b51

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29326.143
VisualStudioVersion = 16.0.29503.13
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm_raytracer", "mm_raytracer\mm_raytracer.vcxproj", "{F616952A-33C3-456C-9AC1-C4E727436E38}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGL_Raytracer", "OpenGL_Raytracer\OpenGL_Raytracer.vcxproj", "{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -13,19 +13,19 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x64.ActiveCfg = Debug|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x64.Build.0 = Debug|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x86.ActiveCfg = Debug|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x86.Build.0 = Debug|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x64.ActiveCfg = Release|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x64.Build.0 = Release|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x86.ActiveCfg = Release|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x86.Build.0 = Release|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x64.ActiveCfg = Debug|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x64.Build.0 = Debug|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x86.ActiveCfg = Debug|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x86.Build.0 = Debug|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x64.ActiveCfg = Release|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x64.Build.0 = Release|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x86.ActiveCfg = Release|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {23D18646-C0E4-43B3-9DBD-CFD92B2509C3}
SolutionGuid = {6AA46A34-6C9F-43D1-A833-357B250F7C56}
EndGlobalSection
EndGlobal
 OpenGL_Raytracer.cpp
OpenGL_Raytracer.vcxproj -> C:\Users\eleph\source\repos\OpenGL_Raytracer\Debug\OpenGL_Raytracer.exe
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\GLAD.C
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\GLAD.C
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|C:\Users\brian\Desktop\Multimedia\mm_raytracer\VisualStudio\|
Debug|Win32|C:\Users\eleph\source\repos\OpenGL_Raytracer\|
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\OPENGL_RAYTRACER.OBJ
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\GLAD.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\GLCALLS.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\OPENGL_RAYTRACER.OBJ
......
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\GLAD.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\GLCALLS.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\DEBUG\OPENGL_RAYTRACER.OBJ
#include <string.h>
#include <iostream>
#include "glad.h"
#include <GLFW/glfw3.h>
#include "glCalls.h"
int main(int argc, char const* argv[])
{
int width = 640;
int height = 480;
//set width and height according to input parameters
if (argc == 3)
{
if (int inWidth = atoi(argv[1]) < 10000)
{
if (inWidth < 0)
width = -inWidth;
}
if (int inHeight = atoi(argv[1]) < 10000)
{
if (inHeight < 0)
width = -inHeight;
}
}
rt::rt_window* tracingWindow;
try
{
tracingWindow = new rt::rt_window(width, height, "Raytracer");
}
catch (const std::exception& e)
{
std::cout << e.what() << std::endl;
return -1;
}
tracingWindow->run();
return 0;
}
......@@ -20,9 +20,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{F616952A-33C3-456C-9AC1-C4E727436E38}</ProjectGuid>
<ProjectGuid>{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>mmraytracer</RootNamespace>