Commit bfe32fa8 authored by Baldur Paulwitz's avatar Baldur Paulwitz

Merge branch 'brian' of...

Merge branch 'brian' of https://gitlab.hrz.tu-chemnitz.de/bp59gudo--tu-freiberg.de/mm_raytracer into brian
parents 76be0e62 2ce9a4a4

Too many changes to show.

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

c:\users\eleph\documents\github\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.pdb
c:\users\eleph\documents\github\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.idb
c:\users\eleph\documents\github\mm_raytracer\visualstudio\mm_raytracer\debug\glad.obj
c:\users\eleph\documents\github\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.obj
c:\users\brian.desktop-db2iif0\desktop\projects\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.pdb
c:\users\brian.desktop-db2iif0\desktop\projects\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.idb
c:\users\brian.desktop-db2iif0\desktop\projects\mm_raytracer\visualstudio\mm_raytracer\debug\glad.obj
c:\users\brian.desktop-db2iif0\desktop\projects\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.obj
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.pdb
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\vc142.idb
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\glad.obj
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.obj
c:\users\eleph\documents\github\mm_raytracer\visualstudio\debug\mm_raytracer.exe
c:\users\eleph\documents\github\mm_raytracer\visualstudio\debug\mm_raytracer.ilk
c:\users\eleph\documents\github\mm_raytracer\visualstudio\debug\mm_raytracer.pdb
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\debug\mm_raytracer.pdb
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\debug\mm_raytracer.exe
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\debug\mm_raytracer.ilk
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\cl.command.1.tlog
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\cl.read.1.tlog
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\cl.write.1.tlog
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\link.command.1.tlog
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\link.read.1.tlog
c:\users\brian\desktop\multimedia\mm_raytracer\visualstudio\mm_raytracer\debug\mm_raytracer.tlog\link.write.1.tlog
Binary files a/VisualStudio/mm_raytracer/Debug/mm_raytracer.tlog/link.command.1.tlog and /dev/null differ
Binary files a/VisualStudio/mm_raytracer/Debug/mm_raytracer.tlog/link.read.1.tlog and /dev/null differ
Binary files a/VisualStudio/mm_raytracer/Debug/mm_raytracer.tlog/link.write.1.tlog and /dev/null differ
......@@ -19,6 +19,9 @@ int main(int argc, char const* argv[])
return -1;
}
// 4x antialiasing
glfwWindowHint(GLFW_SAMPLES, 4);
//need at least OpenGl 4.3 for compute shader
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
......
......@@ -162,16 +162,21 @@
<ClInclude Include="..\..\include\sphere.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\shader\compute.glsl" />
<None Include="..\..\shader\fragment.glsl" />
<None Include="..\..\shader\vertex.glsl" />
<None Include="packages.config" />
</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
......@@ -19,6 +19,9 @@
<Filter Include="Quelldateien\src">
<UniqueIdentifier>{339611eb-a5b0-49d1-8ad6-d0d5886a9f3d}</UniqueIdentifier>
</Filter>
<Filter Include="shader">
<UniqueIdentifier>{a2620821-36aa-4e9c-8e1d-f8d7ea3f4363}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="mm_raytracer.cpp">
......@@ -47,5 +50,14 @@
</ItemGroup>
<ItemGroup>
<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>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="glfw" version="3.3.0.1" targetFramework="native" />
<package id="glm" version="0.9.9.600" targetFramework="native" />
</packages>
\ No newline at end of file
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.10"/>
<title>0.9.9 API documentation: _fixes.hpp Source File</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<script type="text/javascript">
$(document).ready(function() { init_search(); });
</script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">