Commit d8482473 authored by Brian Philipp's avatar Brian Philipp
Browse files

Merge branch 'brian' into 'master'

Brian

See merge request !3
parents d1028440 73af37ca
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
#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>
<RootNamespace>OpenGLRaytracer</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
......@@ -151,25 +151,31 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\glad.c" />
<ClCompile Include="mm_raytracer.cpp" />
<ClCompile Include="glad.c" />
<ClCompile Include="glCalls.cpp" />
<ClCompile Include="OpenGL_Raytracer.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\glad\glad.h" />
<ClInclude Include="..\..\include\KHR\khrplatform.h" />
<ClInclude Include="sphere.h" />
<None Include="packages.config" />
<None Include="Shader\compute.glsl" />
<None Include="Shader\fragment.glsl" />
<None Include="Shader\vertex.glsl" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<ClInclude Include="glad.h" />
<ClInclude Include="glCalls.h" />
<ClInclude Include="khrplatform.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\glfw.3.3.0.1\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.3.0.1\build\native\glfw.targets')" />
<Import Project="..\packages\glm.0.9.9.600\build\native\glm.targets" Condition="Exists('..\packages\glm.0.9.9.600\build\native\glm.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\glfw.3.3.0.1\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.3.0.1\build\native\glfw.targets'))" />
<Error Condition="!Exists('..\packages\glm.0.9.9.600\build\native\glm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glm.0.9.9.600\build\native\glm.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -13,33 +13,42 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Headerdateien\include">
<UniqueIdentifier>{b6cb64f6-511e-4a22-9215-68e841158bc5}</UniqueIdentifier>
</Filter>
<Filter Include="Quelldateien\src">
<UniqueIdentifier>{339611eb-a5b0-49d1-8ad6-d0d5886a9f3d}</UniqueIdentifier>
<Filter Include="Shader">
<UniqueIdentifier>{97bc1d31-081e-43e4-8307-c6b4ed2da5fe}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="mm_raytracer.cpp">
<Filter>Quelldateien\src</Filter>
<ClCompile Include="OpenGL_Raytracer.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="glad.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\..\src\glad.c">
<Filter>Quelldateien\src</Filter>
<ClCompile Include="glCalls.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="sphere.h">
<Filter>Headerdateien\include</Filter>
<None Include="packages.config" />
<None Include="Shader\compute.glsl">
<Filter>Shader</Filter>
</None>
<None Include="Shader\fragment.glsl">
<Filter>Shader</Filter>
</None>
<None Include="Shader\vertex.glsl">
<Filter>Shader</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="glad.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\..\include\glad\glad.h">
<Filter>Headerdateien\include</Filter>
<ClInclude Include="glCalls.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\..\include\KHR\khrplatform.h">
<Filter>Headerdateien\include</Filter>
<ClInclude Include="khrplatform.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
\ No newline at end of file
 glad.c
glCalls.cpp
OpenGL_Raytracer.cpp
Code wird generiert.
Previous IPDB not found, fall back to full compilation.
All 249 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
Codegenerierung ist abgeschlossen.
OpenGL_Raytracer.vcxproj -> C:\Users\eleph\source\repos\OpenGL_Raytracer\Release\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
Release|Win32|C:\Users\eleph\source\repos\OpenGL_Raytracer\|
B^C:\Users\eleph\source\repos\OpenGL_Raytracer\OpenGL_Raytracer\OpenGL_Raytracer.vcxproj
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\GLAD.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\GLCALLS.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\OPENGL_RAYTRACER.OBJ
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\GLAD.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\GLCALLS.OBJ|C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\RELEASE\OPENGL_RAYTRACER.OBJ
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment