Skip to content

Submission #1

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Submission #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65a005d
Completed part1 & part2 simplex
ashima07 Nov 9, 2012
e9385c9
Submission
ashima07 Nov 9, 2012
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
491 changes: 258 additions & 233 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added part1/ImageProcessing/ImageProcessing.sdf
View file
Open in desktop
Binary file not shown.
227 changes: 118 additions & 109 deletions part1/ImageProcessing/ImageProcessing/ImageProcessing.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<None Include="boxBlurFS.glsl" />
<None Include="passthroughFS.glsl" />
<None Include="passthroughVS.glsl" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="Utility.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Utility.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>ImageProcessing</ProjectName>
<ProjectGuid>{C53A9886-B4FD-487A-83A5-01406BA9E8BF}</ProjectGuid>
<RootNamespace>Box_Blur</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\shared32\glew\include;..\..\shared32\freeglut\include;..\Shader_Loading;..\SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\shared32\glew\lib;..\..\shared32\freeglut\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\SOIL\SOIL.vcxproj">
<Project>{25544c77-3b78-405f-a15d-1231d05969f3}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<None Include="boxBlurFS.glsl" />
<None Include="brightness.glsl" />
<None Include="contrast.glsl" />
<None Include="edgeDetection.glsl" />
<None Include="gammaCorrection.glsl" />
<None Include="gaussBlur.glsl" />
<None Include="greyScale.glsl" />
<None Include="imageNegative.glsl" />
<None Include="NightVision.glsl" />
<None Include="passthroughFS.glsl" />
<None Include="passthroughVS.glsl" />
<None Include="toonShader.glsl" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="Utility.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Utility.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>ImageProcessing</ProjectName>
<ProjectGuid>{C53A9886-B4FD-487A-83A5-01406BA9E8BF}</ProjectGuid>
<RootNamespace>Box_Blur</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\shared32\glew\include;..\..\shared32\freeglut\include;..\Shader_Loading;..\SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\shared32\glew\lib;..\..\shared32\freeglut\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\SOIL\SOIL.vcxproj">
<Project>{25544c77-3b78-405f-a15d-1231d05969f3}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
3 changes: 3 additions & 0 deletions part1/ImageProcessing/ImageProcessing/ImageProcessing.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
14 changes: 14 additions & 0 deletions part1/ImageProcessing/ImageProcessing/NightVision.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
varying vec2 v_Texcoords;

uniform sampler2D u_image;

void main(void)
{

//calculate noise
float noise = dot(texture2D(u_image, v_Texcoords).rgb, vec3(0.4, 0.4, 0.4));
//multiply with green color
gl_FragColor = vec4(noise * vec3(0.3, 1.2, 0.3),1.0);


}
11 changes: 11 additions & 0 deletions part1/ImageProcessing/ImageProcessing/brightness.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
varying vec2 v_Texcoords;
uniform sampler2D u_image;

void main(void)
{

float brightness = 0.3;
vec3 brightCol =texture2D(u_image, v_Texcoords).rgb + vec3(brightness);
gl_FragColor = vec4(brightCol, 1.0);

}
10 changes: 10 additions & 0 deletions part1/ImageProcessing/ImageProcessing/contrast.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
varying vec2 v_Texcoords;
uniform sampler2D u_image;

void main(void)
{

float contrast = 1.2;
vec3 contrastCol = (texture2D(u_image, v_Texcoords).rgb - 0.5) * contrast + 0.5;
gl_FragColor = vec4(contrastCol,1.0);
}
39 changes: 39 additions & 0 deletions part1/ImageProcessing/ImageProcessing/edgeDetection.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
varying vec2 v_Texcoords;

uniform sampler2D u_image;
uniform vec2 u_step;

const int KERNEL_WIDTH = 7; // Odd
const float offset = 3.0;

mat3 Sobel_horizontal = mat3(-1, -2, -1 ,0, 0, 0, 1, 2, 1);
mat3 Sobel_vertical=mat3(-1, 0, 1 ,-2 ,0, 2 ,-1, 0, 1);



void main(void)
{


float accum1 = 0.0;
float accum2 = 0.0;


for(int i =0; i<3 ;i++){

for(int j =0; j<3 ;j++){

vec2 coord = vec2(v_Texcoords.s + ((float(i) ) *u_step.x ), v_Texcoords.t + ((float(j) ) *u_step.y ) );
float luminance = dot(texture2D(u_image, coord).rgb, vec3(0.2125, 0.7154, 0.0721));
accum1 += luminance * Sobel_horizontal[i][j];
accum2 += luminance * Sobel_vertical[i][j];
}

}

vec2 col = vec2(accum1, accum2);
float len = length(col);

gl_FragColor = vec4(len,len,len,1.0);

}
10 changes: 10 additions & 0 deletions part1/ImageProcessing/ImageProcessing/gammaCorrection.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
varying vec2 v_Texcoords;
uniform sampler2D u_image;

void main(void)
{

vec3 color = texture2D(u_image, v_Texcoords).rgb;
gl_FragColor =vec4(pow(color, vec3(1.0 / 1.5)), 1.0);

}
31 changes: 31 additions & 0 deletions part1/ImageProcessing/ImageProcessing/gaussBlur.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
varying vec2 v_Texcoords;

uniform sampler2D u_image;
uniform vec2 u_step;

const int KERNEL_WIDTH = 7; // Odd
const float offset = 0.4;
mat3 weight =mat3 (1.0,2.0,1.0,2.0,4.0,2.0,1.0,2.0,1.0)/16.0;

void main(void)
{

vec3 accum = vec3(0.0);

for(int i =0; i<3 ;i++){

for(int j =0; j<3 ;j++){

vec2 coord = vec2(v_Texcoords.s + ((float(i) ) *u_step.x ), v_Texcoords.t + ((float(j) ) *u_step.y ) );
accum += texture2D(u_image, coord).rgb * weight[i][j];

}

}

// gl_FragColor = (accum/16.0);
gl_FragColor = vec4(accum, 1.0);



}
12 changes: 12 additions & 0 deletions part1/ImageProcessing/ImageProcessing/greyScale.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
varying vec2 v_Texcoords;

uniform sampler2D u_image;

void main(void)
{

//grey scale
float luminance = dot(texture2D(u_image, v_Texcoords).rgb, vec3(0.2125, 0.7154, 0.0721));
gl_FragColor = vec4(luminance ,luminance , luminance, 1.0);

}
14 changes: 14 additions & 0 deletions part1/ImageProcessing/ImageProcessing/imageNegative.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
varying vec2 v_Texcoords;

uniform sampler2D u_image;

void main(void)
{

//negetive image
vec4 color = texture2D(u_image, v_Texcoords);
gl_FragColor = vec4(1.0 - color.rgb, 1.0);



}
Loading