Skip to content

Submission #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mchen15 wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Submission #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ab576d5
removed nix and mac projects
mchen15 Oct 26, 2013
a54bde5
Camera struct, vertex shader compete
mchen15 Oct 28, 2013
4506938
vertex assembly kernel done
mchen15 Oct 28, 2013
ada3809
rudimentary rasterization
mchen15 Oct 29, 2013
45425f0
fixed view matrix
mchen15 Oct 29, 2013
cc94edb
added debug statements
mchen15 Oct 29, 2013
33a438a
various bug fixes
mchen15 Oct 30, 2013
f5e898e
turn table
mchen15 Oct 30, 2013
c936adf
nbo
mchen15 Oct 30, 2013
0fb85c0
fixed more bugs and working on frag shader
mchen15 Oct 30, 2013
27e4f1a
back face culling kernel
mchen15 Oct 31, 2013
cb77f03
fragment shader done
mchen15 Oct 31, 2013
16b38ea
anti-aliasing
mchen15 Oct 31, 2013
d80780d
cam rotation
mchen15 Oct 31, 2013
e7367c9
debugging camera translation
mchen15 Oct 31, 2013
3e55472
camera movements done
mchen15 Oct 31, 2013
1d61403
debugging atomic functions
mchen15 Nov 1, 2013
367e99b
trying to fix depth issue
mchen15 Nov 1, 2013
0aa6897
some screenshots
mchen15 Nov 1, 2013
ce7b895
read me
mchen15 Nov 1, 2013
573091d
Update README.md
mchen15 Nov 1, 2013
a14b483
update
mchen15 Nov 6, 2013
507c0d8
readme update
mchen15 Nov 6, 2013
3a13360
bug fix
mchen15 Jan 30, 2014
72d4820
camera fix, toon render, normal render, depth render
mchen15 Jan 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
518 changes: 0 additions & 518 deletions PROJ4_MAC/glfw/include/GL/glfw.h
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions PROJ4_MAC/makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions PROJ4_MAC/run.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions PROJ4_MAC/shaders/passthroughFS.glsl
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions PROJ4_MAC/shaders/passthroughVS.glsl
View file
Open in desktop

This file was deleted.

Binary file removed PROJ4_NIX/565rasterizer
View file
Open in desktop
Binary file not shown.
40 changes: 0 additions & 40 deletions PROJ4_NIX/makefile
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions PROJ4_WIN/565Rasterizer/565Rasterizer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<ClInclude Include="..\..\src\ObjCore\obj.h" />
<ClInclude Include="..\..\src\ObjCore\objloader.h" />
<ClInclude Include="..\..\src\rasterizeKernels.h" />
<ClInclude Include="..\..\src\rasterizeStructs.h" />
<ClInclude Include="..\..\src\rasterizeTools.h" />
<ClInclude Include="..\..\src\utilities.h" />
</ItemGroup>
Expand All @@ -30,6 +31,10 @@
<ItemGroup>
<CudaCompile Include="..\..\src\rasterizeKernels.cu" />
</ItemGroup>
<ItemGroup>
<None Include="shaders\passthroughFS.glsl" />
<None Include="shaders\passthroughVS.glsl" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
Expand All @@ -41,12 +46,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -84,6 +91,7 @@
<CudaCompile>
<CompileOut>$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
<Include>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</Include>
<CodeGeneration>compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -109,6 +117,7 @@
<CudaCompile>
<CompileOut>$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
<Include>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</Include>
<CodeGeneration>compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
14 changes: 14 additions & 0 deletions PROJ4_WIN/565Rasterizer/565Rasterizer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<ClInclude Include="..\..\src\utilities.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rasterizeStructs.h">
<Filter>headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\ObjCore\obj.cpp">
Expand Down Expand Up @@ -53,10 +56,21 @@
<Filter Include="headers">
<UniqueIdentifier>{ff2076c3-2be2-4a20-89ed-1f27da7b052a}</UniqueIdentifier>
</Filter>
<Filter Include="Shaders">
<UniqueIdentifier>{b66d28ac-5e36-43db-92c7-5d776e9ae34b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\rasterizeKernels.cu">
<Filter>source</Filter>
</CudaCompile>
</ItemGroup>
<ItemGroup>
<None Include="shaders\passthroughFS.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="shaders\passthroughVS.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
</Project>
Loading