diff --git a/Texturing/Texturing/run_multitex.bat b/Texturing/Texturing/run_multitex.bat new file mode 100644 index 0000000000000000000000000000000000000000..0722ee4ed672d9ebf59299963ece4a9ce08d172e --- /dev/null +++ b/Texturing/Texturing/run_multitex.bat @@ -0,0 +1 @@ +start ..\x64\Debug\Texturing.exe multi-tex \ No newline at end of file diff --git a/Texturing/Texturing/run_tex.bat b/Texturing/Texturing/run_tex.bat new file mode 100644 index 0000000000000000000000000000000000000000..7a5d0da76e7aef41ddadf7925437eb08c0023603 --- /dev/null +++ b/Texturing/Texturing/run_tex.bat @@ -0,0 +1 @@ +start ..\x64\Debug\Texturing.exe texture \ No newline at end of file diff --git a/Texturing/Texturing/shader/texture.frag.glsl b/Texturing/Texturing/shader/texture.frag.glsl index 5d9834b6fa308cd719070397c19a644e6eb8a888..5565afa76dc40b77fe1f8e05da5f1f7bae0d45ba 100644 --- a/Texturing/Texturing/shader/texture.frag.glsl +++ b/Texturing/Texturing/shader/texture.frag.glsl @@ -3,7 +3,6 @@ in vec3 Position; in vec3 Normal; in vec2 TexCoord; -in float Alpha; layout(binding=0) uniform sampler2D Tex1; diff --git a/Texturing/Texturing/shader/texture.vert.glsl b/Texturing/Texturing/shader/texture.vert.glsl index 751a33795d953c179db5b11617563a78a7d5e13c..55834cc61a94e79ca220b4b5d722d963154f0d98 100644 --- a/Texturing/Texturing/shader/texture.vert.glsl +++ b/Texturing/Texturing/shader/texture.vert.glsl @@ -3,12 +3,10 @@ layout (location = 0) in vec3 VertexPosition; layout (location = 1) in vec3 VertexNormal; layout (location = 2) in vec2 VertexTexCoord; -layout (location = 4) in float VertexAlpha; out vec3 Position; out vec3 Normal; out vec2 TexCoord; -out float Alpha; uniform mat4 ModelViewMatrix; uniform mat3 NormalMatrix; @@ -20,7 +18,6 @@ void main() TexCoord = VertexTexCoord; Normal = normalize( NormalMatrix * VertexNormal); Position = vec3( ModelViewMatrix * vec4(VertexPosition,1.0) ); - Alpha = VertexAlpha; gl_Position = MVP * vec4(VertexPosition,1.0); } diff --git a/Texturing/Texturing/texture.cpp b/Texturing/Texturing/texture.cpp index 7ab947a36667f2ad106926bd643fb2f31e19c032..4a829a6f905819d2194fd1ad8fd1dc973245ad8d 100644 --- a/Texturing/Texturing/texture.cpp +++ b/Texturing/Texturing/texture.cpp @@ -15,8 +15,8 @@ GLuint Texture::loadTexture( const std::string & fName ) { glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, width, height); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); Texture::deletePixels(data); } diff --git a/Texturing/clean.bat b/Texturing/clean.bat index 347357807e3b50cdc390b5a66461d4042f5ffeb0..a72765f6b5e46a34b6426875067339bf787b82cb 100644 --- a/Texturing/clean.bat +++ b/Texturing/clean.bat @@ -1,7 +1,6 @@ rd /S /Q .vs rd /S /Q Debug rd /S /Q Release -rd /S /Q x64 rd /S /Q Texturing\Debug rd /S /Q Texturing\Release rd /S /Q Texturing\x64 diff --git a/Texturing/x64/Debug/Texturing.exe b/Texturing/x64/Debug/Texturing.exe new file mode 100644 index 0000000000000000000000000000000000000000..9429ef404c36c9a78ca3911555fbc14957d36f56 Binary files /dev/null and b/Texturing/x64/Debug/Texturing.exe differ diff --git a/Texturing/x64/Debug/Texturing.ilk b/Texturing/x64/Debug/Texturing.ilk new file mode 100644 index 0000000000000000000000000000000000000000..3c2539ae9144bc649b4f01a6ab96dbf72570278d Binary files /dev/null and b/Texturing/x64/Debug/Texturing.ilk differ diff --git a/Texturing/x64/Debug/Texturing.pdb b/Texturing/x64/Debug/Texturing.pdb new file mode 100644 index 0000000000000000000000000000000000000000..5f06f736d71d927dd70d47cca9e4571ce5bb8101 Binary files /dev/null and b/Texturing/x64/Debug/Texturing.pdb differ