diff --git a/Texturing/Texturing/Texturing.vcxproj.user b/Texturing/Texturing/Texturing.vcxproj.user index a417f37a530db19aed4a759ea093ed9fdd07b68e..40d73903c6780233338d23ba4e9646c7633a82e0 100644 --- a/Texturing/Texturing/Texturing.vcxproj.user +++ b/Texturing/Texturing/Texturing.vcxproj.user @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LocalDebuggerCommandArguments>multi-tex</LocalDebuggerCommandArguments> + <LocalDebuggerCommandArguments>sampler-obj</LocalDebuggerCommandArguments> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LocalDebuggerCommandArguments>multi-tex</LocalDebuggerCommandArguments> + <LocalDebuggerCommandArguments>sampler-obj</LocalDebuggerCommandArguments> <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> </PropertyGroup> </Project> \ No newline at end of file diff --git a/Texturing/Texturing/cube.cpp b/Texturing/Texturing/cube.cpp index b95a8f4cdaca63a50570bfd649c47317b5e339fb..d5c908be0614af91296a4638e8c3219d356bb348 100644 --- a/Texturing/Texturing/cube.cpp +++ b/Texturing/Texturing/cube.cpp @@ -51,21 +51,6 @@ Cube::Cube( GLfloat side ) 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; - /*std::vector<GLfloat> tex2 = { - // Front - 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, - // Right - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, - // Back - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, - // Left - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, - // Bottom - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, - // Top - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f - };*/ - //Addition for blending std::vector<GLfloat> alpha = { // Front diff --git a/Texturing/Texturing/run_sampler.bat b/Texturing/Texturing/run_sampler.bat new file mode 100644 index 0000000000000000000000000000000000000000..6b92929bcd3bc099e7247a118ee34a0bf83bc9c3 --- /dev/null +++ b/Texturing/Texturing/run_sampler.bat @@ -0,0 +1 @@ +start ..\x64\Debug\Texturing.exe sampler-obj \ No newline at end of file diff --git a/Texturing/Texturing/scenesamplerobj.cpp b/Texturing/Texturing/scenesamplerobj.cpp index 463651e258e88bbefb3353d968cd60b83ee9f94e..f021bef2210cf924a165d43a07f140ea23a89bb6 100644 --- a/Texturing/Texturing/scenesamplerobj.cpp +++ b/Texturing/Texturing/scenesamplerobj.cpp @@ -26,8 +26,6 @@ void SceneSamplerObj::initScene() prog.setUniform("Light.L", vec3(1.0f)); prog.setUniform("Light.La", vec3(0.2f) ); - //unsigned char* data = Texture::loadPixels("../media/texture/test.jpg", width, height); - // A simple 128x128 checkerboard texture GLint w = 128, h = 128, checkSize = 4; std::vector<GLubyte> data(w * h * 4); @@ -70,8 +68,6 @@ void SceneSamplerObj::initScene() glSamplerParameteri(linearSampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(linearSampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //Texture::deletePixels(data); - // Bind texture object and sampler object to texture unit glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, texID); @@ -101,13 +97,11 @@ void SceneSamplerObj::render() glm::mat4 rot = glm::rotate(glm::mat4(1.0f), glm::radians(10.0f), glm::vec3(1,0,0)); model = glm::translate(rot, glm::vec3(-5.01f,0.f,0.f)); - //model = glm::translate(rot, glm::vec3(-1.01f, 0.f, 0.f)); setMatrices(); glBindSampler(0, nearestSampler); plane.render(); model = glm::translate(rot, glm::vec3(5.01f,0.f,0.f)); - //model = glm::translate(rot, glm::vec3(1.01f, 0.f, 0.f)); setMatrices(); glBindSampler(0, linearSampler); plane.render(); diff --git a/Texturing/x64/Debug/Texturing.exe b/Texturing/x64/Debug/Texturing.exe index 9429ef404c36c9a78ca3911555fbc14957d36f56..31671e3a5bd42794874729739445a698217c5215 100644 Binary files a/Texturing/x64/Debug/Texturing.exe and b/Texturing/x64/Debug/Texturing.exe differ diff --git a/Texturing/x64/Debug/Texturing.ilk b/Texturing/x64/Debug/Texturing.ilk index 3c2539ae9144bc649b4f01a6ab96dbf72570278d..53d2da064b43c10eda737e93b8393d5f2728e7ad 100644 Binary files a/Texturing/x64/Debug/Texturing.ilk and b/Texturing/x64/Debug/Texturing.ilk differ diff --git a/Texturing/x64/Debug/Texturing.pdb b/Texturing/x64/Debug/Texturing.pdb index 5f06f736d71d927dd70d47cca9e4571ce5bb8101..b4f9590a0ec85c0259e095d4eb02d6eaa0b79196 100644 Binary files a/Texturing/x64/Debug/Texturing.pdb and b/Texturing/x64/Debug/Texturing.pdb differ