From 8d8843cb11c879959a1fa2c12c98d70fe6e6cf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D1=8C=D0=B1=D0=B5=D1=80=D1=82=20=D0=93=D0=B0?= =?UTF-8?q?=D0=B4=D0=B8=D0=B5=D0=B2?= Date: Sat, 1 Mar 2025 11:44:31 +0600 Subject: [PATCH] linuc --- .gitignore | 4 ++++ ObjLoader.cpp | 2 -- ShaderManager.cpp | 3 ++- aaaa | 19 +++++++++++++++++++ default.fragment | 22 +++++++++++----------- default.vertex | 20 ++++++++++---------- defaultColor.fragment | 2 +- main.cpp | 25 ++++++++++++++++++++----- 8 files changed, 67 insertions(+), 30 deletions(-) create mode 100644 aaaa diff --git a/.gitignore b/.gitignore index 34c8dee..11cb6fc 100755 --- a/.gitignore +++ b/.gitignore @@ -385,4 +385,8 @@ FodyWeavers.xsd # JetBrains Rider .idea/ + + +sdl_app + *.sln.iml diff --git a/ObjLoader.cpp b/ObjLoader.cpp index 01c7c44..b6622f0 100644 --- a/ObjLoader.cpp +++ b/ObjLoader.cpp @@ -1,7 +1,5 @@ // OBJ_Loader.h - A Single Header OBJ Model Loader -#pragma once - #include "ObjLoader.h" // Iostream - STD I/O Library diff --git a/ShaderManager.cpp b/ShaderManager.cpp index 9d606de..f0e5a2f 100755 --- a/ShaderManager.cpp +++ b/ShaderManager.cpp @@ -1,5 +1,5 @@ #include "ShaderManager.h" - +#include namespace ZL { @@ -127,6 +127,7 @@ namespace ZL { std::string fragmentShader = readTextFile(fragmentShaderFileName); + ///std::cout << "Shader: "<< vertexShader << std::endl; shaderResourceMap[shaderName] = std::make_shared(vertexShader, fragmentShader); } diff --git a/aaaa b/aaaa new file mode 100644 index 0000000..325b762 --- /dev/null +++ b/aaaa @@ -0,0 +1,19 @@ +//----------- Vertex shader + +attribute vec3 vPosition; +attribute vec2 vTexCoord; +varying vec2 texCoord; + +uniform mat4 ProjectionModelViewMatrix; + +void main() +{ + gl_Position = ProjectionModelViewMatrix * vec4(vPosition.xyz, 1.0); + texCoord = vTexCoord; +} + +//------------- Fragment shader + + + +In windows it is ok. In linux, error: Failed to compile fragment shader code! diff --git a/default.fragment b/default.fragment index ebb6d0d..a28f4e6 100755 --- a/default.fragment +++ b/default.fragment @@ -1,12 +1,12 @@ -precision mediump float; -uniform sampler2D Texture; -varying vec2 texCoord; - -void main() -{ - vec4 color = texture2D(Texture,texCoord).rgba; - //gl_FragColor = vec4(color.rgb*0.1 + vec3(0.9, 0.9, 0.9), 1.0); - - gl_FragColor = color; - +//precision mediump float; +uniform sampler2D Texture; +varying vec2 texCoord; + +void main() +{ + vec4 color = texture2D(Texture,texCoord).rgba; + //gl_FragColor = vec4(color.rgb*0.1 + vec3(0.9, 0.9, 0.9), 1.0); + + gl_FragColor = color; + } \ No newline at end of file diff --git a/default.vertex b/default.vertex index 99de0e6..b385eb9 100755 --- a/default.vertex +++ b/default.vertex @@ -1,11 +1,11 @@ -attribute vec3 vPosition; -attribute vec2 vTexCoord; -varying vec2 texCoord; - -uniform mat4 ProjectionModelViewMatrix; - -void main() -{ - gl_Position = ProjectionModelViewMatrix * vec4(vPosition.xyz, 1.0); - texCoord = vTexCoord; +attribute vec3 vPosition; +attribute vec2 vTexCoord; +varying vec2 texCoord; + +uniform mat4 ProjectionModelViewMatrix; + +void main() +{ + gl_Position = ProjectionModelViewMatrix * vec4(vPosition.xyz, 1.0); + texCoord = vTexCoord; } \ No newline at end of file diff --git a/defaultColor.fragment b/defaultColor.fragment index 1e3d8c1..3f3571a 100644 --- a/defaultColor.fragment +++ b/defaultColor.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precision mediump float; varying vec3 color; void main() diff --git a/main.cpp b/main.cpp index 4fd4fd4..ec5acbe 100755 --- a/main.cpp +++ b/main.cpp @@ -186,6 +186,8 @@ namespace ZL renderer.DrawVertexRenderStruct(GameObjects::testmd3mutable[1]); */ + + GameObjects::bxMutable.AssignFrom(GameObjects::bx.mesh); GameObjects::bxMutable.RefreshVBO(); renderer.DrawVertexRenderStruct(GameObjects::bxMutable); @@ -282,7 +284,7 @@ namespace ZL CheckGlError(); - ///GameObjects::testmd3 = testLoadModel(); + //GameObjects::testmd3 = testLoadModel(); /* GameObjects::testmd3mutable.resize(GameObjects::testmd3.size()); @@ -296,16 +298,22 @@ namespace ZL }*/ //Load shaders: - renderer.shaderManager.AddShaderFromFiles("default", "./default.vertex", "./default.fragment"); + std::cout << "Hello test 1" << std::endl; + renderer.shaderManager.AddShaderFromFiles("default", "./default.vertex", "./default.fragment"); + + std::cout << "Hello test 2" << std::endl; renderer.shaderManager.AddShaderFromFiles("defaultColor", "./defaultColor.vertex", "./defaultColor.fragment"); - + std::cout << "Hello test 2x" << std::endl; + //Load textures GameObjects::birdTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./bird.bmp32")); - GameObjects::backgroundTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./background.bmp")); + std::cout << "Hello test 3x" << std::endl; + + GameObjects::backgroundTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./background.bmp")); GameObjects::pipeTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./pipe.bmp32")); GameObjects::gameOverTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./game_over.bmp32")); //GameObjects::testObjTexturePtr = std::make_shared(CreateTextureDataFromPng("./chair_01_Base_Color.png")); - GameObjects::testObjTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./chair_01_Base_Color.bmp")); + //GameObjects::testObjTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./chair_01_Base_Color.bmp")); //GameObjects::md3TexturePtr = std::make_shared(CreateTextureDataFromPng("./model/sarge/band.png")); @@ -313,6 +321,8 @@ namespace ZL //GameObjects::bx.LoadFromFile("C:\\Work\\GameJam2025-02\\mesh_armature_and_animation_data02.txt"); + std::cout << "Hello test 3" << std::endl; + CheckGlError(); //Create bird mesh GameObjects::birdMesh.data = CreateRect2D({ 0.f, 0.f }, { GameConsts::birdScale * BIRD_WIDTH, GameConsts::birdScale * BIRD_HEIGHT }, 0); @@ -350,6 +360,8 @@ namespace ZL GameObjects::testObjMeshMutable.data = GameObjects::testObjMesh; GameObjects::testObjMeshMutable.RefreshVBO(); + + std::cout << "Hello test 4x" << std::endl; //Set some game values Env::birdStartPos = { Env::width * 0.2f, Env::getActualClientHeight() * 0.5f }; @@ -362,6 +374,9 @@ namespace ZL renderer.InitOpenGL(); CheckGlError(); + + + std::cout << "Hello test 5x" << std::endl; } void render() {