diff --git a/proj-windows/CMakeLists.txt b/proj-windows/CMakeLists.txt index ba8c6d0..2355739 100644 --- a/proj-windows/CMakeLists.txt +++ b/proj-windows/CMakeLists.txt @@ -80,7 +80,7 @@ target_compile_definitions(space-game001 PRIVATE WIN32_LEAN_AND_MEAN PNG_ENABLED SDL_MAIN_HANDLED -# NETWORK + NETWORK SIMPLIFIED ) diff --git a/resources/shaders/defaultAtmosphere_web.fragment b/resources/shaders/defaultAtmosphere_web.fragment index 8ad78af..718e19b 100644 --- a/resources/shaders/defaultAtmosphere_web.fragment +++ b/resources/shaders/defaultAtmosphere_web.fragment @@ -1,4 +1,4 @@ -precision highp float; +//precisionhighp float; // Фрагментный шейдер: uniform vec3 uColor; diff --git a/resources/shaders/defaultColor_web.fragment b/resources/shaders/defaultColor_web.fragment index 1e3d8c1..9dfd488 100644 --- a/resources/shaders/defaultColor_web.fragment +++ b/resources/shaders/defaultColor_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; varying vec3 color; void main() diff --git a/resources/shaders/default_env_web.fragment b/resources/shaders/default_env_web.fragment index 505814f..be588de 100644 --- a/resources/shaders/default_env_web.fragment +++ b/resources/shaders/default_env_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; uniform samplerCube Texture; varying vec3 dir; diff --git a/resources/shaders/default_texture_web.fragment b/resources/shaders/default_texture_web.fragment index 1c3c571..f59b4f7 100644 --- a/resources/shaders/default_texture_web.fragment +++ b/resources/shaders/default_texture_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; uniform sampler2D Texture; varying vec2 texCoord; diff --git a/resources/shaders/default_web.fragment b/resources/shaders/default_web.fragment index 80c01d7..7548e9e 100644 --- a/resources/shaders/default_web.fragment +++ b/resources/shaders/default_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; uniform sampler2D Texture; varying vec2 texCoord; diff --git a/resources/shaders/env_sky_web.fragment b/resources/shaders/env_sky_web.fragment index 971d78c..18a1169 100644 --- a/resources/shaders/env_sky_web.fragment +++ b/resources/shaders/env_sky_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; uniform samplerCube Texture; uniform float skyPercent; uniform float uPlayerLightFactor; // Глобальный фактор дня/ночи для позиции игрока diff --git a/resources/shaders/planet_bake_web.fragment b/resources/shaders/planet_bake_web.fragment index c08c976..cd404ba 100644 --- a/resources/shaders/planet_bake_web.fragment +++ b/resources/shaders/planet_bake_web.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; varying vec2 TexCoord; varying float vHeight; diff --git a/resources/shaders/planet_land.vertex b/resources/shaders/planet_land.vertex index 1eb3120..bbec690 100644 --- a/resources/shaders/planet_land.vertex +++ b/resources/shaders/planet_land.vertex @@ -15,7 +15,7 @@ varying vec3 vWorldNormal; uniform mat4 ProjectionModelViewMatrix; uniform mat4 ModelViewMatrix; -uniform highp vec3 uViewPos; +uniform vec3 uViewPos; void main() { gl_Position = ProjectionModelViewMatrix * vec4(vPosition, 1.0); diff --git a/resources/shaders/planet_land_web.fragment b/resources/shaders/planet_land_web.fragment index d2047cc..a569efa 100644 --- a/resources/shaders/planet_land_web.fragment +++ b/resources/shaders/planet_land_web.fragment @@ -1,4 +1,4 @@ -precision highp float; +//precisionhighp float; varying vec2 TexCoord; varying vec3 vViewDirTangent; varying vec3 Color; diff --git a/resources/shaders/planet_stone.vertex b/resources/shaders/planet_stone.vertex index ab7d17f..d0c0d57 100644 --- a/resources/shaders/planet_stone.vertex +++ b/resources/shaders/planet_stone.vertex @@ -14,7 +14,7 @@ varying vec3 vWorldNormal; uniform mat4 ProjectionModelViewMatrix; uniform mat4 ModelViewMatrix; -uniform highp vec3 uViewPos; +uniform vec3 uViewPos; void main() { vWorldNormal = vNormal; @@ -23,8 +23,6 @@ void main() { vec3 viewDirWorld = normalize(uViewPos - vPosition); - // Строим матрицу перехода из атрибутов - // Так как базис ортонормирован, TBN^-1 == TBN_transpose vViewDirTangent = vec3( dot(viewDirWorld, vTangent), dot(viewDirWorld, vBinormal), diff --git a/resources/shaders/planet_stone_web.fragment b/resources/shaders/planet_stone_web.fragment index 64333e4..e394f56 100644 --- a/resources/shaders/planet_stone_web.fragment +++ b/resources/shaders/planet_stone_web.fragment @@ -1,4 +1,4 @@ -precision highp float; +//precisionhighp float; // planetStone фрагментный шейдер varying vec2 TexCoord; diff --git a/resources/shaders/spark.fragment b/resources/shaders/spark.fragment index 1c3c571..f59b4f7 100644 --- a/resources/shaders/spark.fragment +++ b/resources/shaders/spark.fragment @@ -1,4 +1,4 @@ -precision mediump float; +//precisionmediump float; uniform sampler2D Texture; varying vec2 texCoord; diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 5e12ff8..641ed8d 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -28,6 +28,7 @@ add_subdirectory("${BOOST_SRC_DIR}/libs/predef" boost-predef-build EXCLUDE_FROM_ add_executable(Server server.cpp ../src/network/ClientState.h +../src/network/ClientState.cpp ) target_include_directories(Server PRIVATE ${BOOST_SRC_DIR}) diff --git a/src/render/ShaderManager.cpp b/src/render/ShaderManager.cpp index 8e27bb8..a45cf64 100644 --- a/src/render/ShaderManager.cpp +++ b/src/render/ShaderManager.cpp @@ -14,7 +14,8 @@ namespace ZL { char infoLog[CONST_INFOLOG_LENGTH]; int infoLogLength; - + char infoLog2[CONST_INFOLOG_LENGTH]; + int infoLogLength2; int vertexShaderCompiled; int fragmentShaderCompiled; int programLinked; @@ -40,7 +41,8 @@ namespace ZL { glCompileShader(fragmentShader); glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &fragmentShaderCompiled); - glGetShaderInfoLog(fragmentShader, CONST_INFOLOG_LENGTH, &infoLogLength, infoLog); + glGetShaderInfoLog(fragmentShader, CONST_INFOLOG_LENGTH, &infoLogLength2, infoLog2); + if (!vertexShaderCompiled) { #ifdef __ANDROID__