added ship velocity using dragging volume

Game.cpp

@@ -193,7 +193,66 @@ void Game::setup() {
         boxRenderArr[i].RefreshVBO();
     }
 
+
+    buttonTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/button.png", CONST_ZIP_FILE));
+
+    button.data.PositionData.push_back({ 100, 100, 0 });
+    button.data.PositionData.push_back({ 100, 150, 0 });
+    button.data.PositionData.push_back({ 300, 150, 0 });
+    button.data.PositionData.push_back({ 100, 100, 0 });
+    button.data.PositionData.push_back({ 300, 150, 0 });
+    button.data.PositionData.push_back({ 300, 100, 0 });
+
+    button.data.TexCoordData.push_back({ 0,0 });
+    button.data.TexCoordData.push_back({ 0,1 });
+    button.data.TexCoordData.push_back({ 1,1 });
+    button.data.TexCoordData.push_back({ 0,0 });
+    button.data.TexCoordData.push_back({ 1,1 });
+    button.data.TexCoordData.push_back({ 1,0 });
+
+    button.RefreshVBO();
+
+    musicVolumeBarTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/musicVolumeBarTexture.png", CONST_ZIP_FILE));
+
+    musicVolumeBar.data.PositionData.push_back({ 1190, 100, 0 });
+    musicVolumeBar.data.PositionData.push_back({ 1190, 600, 0 });
+    musicVolumeBar.data.PositionData.push_back({ 1200, 600, 0 });
+    musicVolumeBar.data.PositionData.push_back({ 1190, 100, 0 });
+    musicVolumeBar.data.PositionData.push_back({ 1200, 600, 0 });
+    musicVolumeBar.data.PositionData.push_back({ 1200, 100, 0 });
+
+    musicVolumeBar.data.TexCoordData.push_back({ 0,0 });
+    musicVolumeBar.data.TexCoordData.push_back({ 0,1 });
+    musicVolumeBar.data.TexCoordData.push_back({ 1,1 });
+    musicVolumeBar.data.TexCoordData.push_back({ 0,0 });
+    musicVolumeBar.data.TexCoordData.push_back({ 1,1 });
+    musicVolumeBar.data.TexCoordData.push_back({ 1,0 });
+
+    musicVolumeBar.RefreshVBO();
+
+
+    musicVolumeBarButtonTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/musicVolumeBarButton.png", CONST_ZIP_FILE));
+
+    float musicVolumeBarButtonButtonCenterY = 350.0f;
+
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 });
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 });
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 });
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 });
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 });
+    musicVolumeBarButton.data.PositionData.push_back({ musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 });
+
+    musicVolumeBarButton.data.TexCoordData.push_back({ 0,0 });
+    musicVolumeBarButton.data.TexCoordData.push_back({ 0,1 });
+    musicVolumeBarButton.data.TexCoordData.push_back({ 1,1 });
+    musicVolumeBarButton.data.TexCoordData.push_back({ 0,0 });
+    musicVolumeBarButton.data.TexCoordData.push_back({ 1,1 });
+    musicVolumeBarButton.data.TexCoordData.push_back({ 1,0 });
+
+    musicVolumeBarButton.RefreshVBO();
     renderer.InitOpenGL();
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     
 }
 
@@ -230,6 +289,7 @@ void Game::drawCubemap()
     renderer.shaderManager.PopShader();
     CheckGlError();
 }
+
 void Game::drawShip()
 {
     static const std::string defaultShaderName = "default";
@@ -304,6 +364,77 @@ void Game::drawBoxes()
     renderer.shaderManager.PopShader();
     CheckGlError();
 }
+void Game::UpdateVolumeKnob() {
+    float musicVolumeBarButtonButtonCenterY = volumeBarMinY + musicVolume * (volumeBarMaxY - volumeBarMinY);
+
+    auto& pos = musicVolumeBarButton.data.PositionData;
+
+    pos[0] = { musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 };
+    pos[1] = { musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 };
+    pos[2] = { musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 };
+    pos[3] = { musicVolumeBarButtonButtonCenterX - musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 };
+    pos[4] = { musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY + musicVolumeBarButtonButtonRadius, 0 };
+    pos[5] = { musicVolumeBarButtonButtonCenterX + musicVolumeBarButtonButtonRadius, musicVolumeBarButtonButtonCenterY - musicVolumeBarButtonButtonRadius, 0 };
+
+    musicVolumeBarButton.RefreshVBO();
+
+}
+
+void Game::UpdateVolumeFromMouse(int mouseX, int mouseY) {
+
+    int uiX = mouseX;
+    int uiY = Environment::height - mouseY;
+    Environment::shipVelocity = (musicVolume - 0.2) * (20.0);
+    if (uiY < volumeBarMinY || uiY > volumeBarMaxY)
+    {
+        return;
+    }
+
+    float t = (uiY - volumeBarMinY) / (volumeBarMaxY - volumeBarMinY);
+    if (t < 0.0f) t = 0.0f;
+    if (t > 1.0f) t = 1.0f;
+    musicVolume = t;
+    UpdateVolumeKnob();
+}
+void Game::drawUI()
+{
+    static const std::string defaultShaderName = "default";
+    static const std::string envShaderName = "env";
+    static const std::string vPositionName = "vPosition";
+    static const std::string vTexCoordName = "vTexCoord";
+    static const std::string textureUniformName = "Texture";
+
+
+    glClear(GL_DEPTH_BUFFER_BIT);
+
+    renderer.shaderManager.PushShader(defaultShaderName);
+    renderer.RenderUniform1i(textureUniformName, 0);
+    renderer.EnableVertexAttribArray(vPositionName);
+    renderer.EnableVertexAttribArray(vTexCoordName);
+
+    renderer.PushProjectionMatrix(Environment::width, Environment::height, -1, 1);
+    renderer.PushMatrix();
+
+    renderer.LoadIdentity();
+    
+
+    glBindTexture(GL_TEXTURE_2D, buttonTexture->getTexID());
+    renderer.DrawVertexRenderStruct(button);
+
+    glBindTexture(GL_TEXTURE_2D, musicVolumeBarTexture->getTexID());
+    renderer.DrawVertexRenderStruct(musicVolumeBar);
+
+    glBindTexture(GL_TEXTURE_2D, musicVolumeBarButtonTexture->getTexID());
+    renderer.DrawVertexRenderStruct(musicVolumeBarButton);
+
+    renderer.PopMatrix();
+    renderer.PopProjectionMatrix();
+    renderer.DisableVertexAttribArray(vPositionName);
+    renderer.DisableVertexAttribArray(vTexCoordName);
+
+    renderer.shaderManager.PopShader();
+    CheckGlError();
+}
 
 void Game::drawScene() {
     static const std::string defaultShaderName = "default";
@@ -322,6 +453,8 @@ void Game::drawScene() {
     drawCubemap();
     drawShip();
     drawBoxes();
+
+    drawUI();
     
     CheckGlError();
 }
@@ -406,20 +539,43 @@ void Game::update() {
         }
         else if (event.type == SDL_MOUSEBUTTONDOWN) {
             // 1. Îáðàáîòêà íàæàòèÿ êíîïêè ìûøè
-            Environment::tapDownHold = true;
-            // Êîîðäèíàòû íà÷àëüíîãî íàæàòèÿ
-            Environment::tapDownStartPos.v[0] = event.button.x;
-            Environment::tapDownStartPos.v[1] = event.button.y;
-            // Íà÷àëüíàÿ ïîçèöèÿ òàêæå ñòàíîâèòñÿ òåêóùåé
-            Environment::tapDownCurrentPos.v[0] = event.button.x;
-            Environment::tapDownCurrentPos.v[1] = event.button.y;
+
+            int mx = event.button.x;
+            int my = event.button.y;
+
+            std::cout << mx << " " << my << '\n'; 
+            int uiX = mx;
+            int uiY = Environment::height - my;
+            if (uiX >= volumeBarMinX && uiX <= volumeBarMaxX &&
+                uiY >= volumeBarMinY && uiY <= volumeBarMaxY) {
+                isDraggingVolume = true;
+                UpdateVolumeFromMouse(mx, my);
+            }
+            else {
+                Environment::tapDownHold = true;
+                // Êîîðäèíàòû íà÷àëüíîãî íàæàòèÿ
+                Environment::tapDownStartPos.v[0] = event.button.x;
+                Environment::tapDownStartPos.v[1] = event.button.y;
+                // Íà÷àëüíàÿ ïîçèöèÿ òàêæå ñòàíîâèòñÿ òåêóùåé
+                Environment::tapDownCurrentPos.v[0] = event.button.x;
+                Environment::tapDownCurrentPos.v[1] = event.button.y;
+            }
+            
         }
         else if (event.type == SDL_MOUSEBUTTONUP) {
             // 2. Îáðàáîòêà îòïóñêàíèÿ êíîïêè ìûøè
+            isDraggingVolume = false;
             Environment::tapDownHold = false;
         }
         else if (event.type == SDL_MOUSEMOTION) {
             // 3. Îáðàáîòêà ïåðåìåùåíèÿ ìûøè
+            int mx = event.motion.x;
+            int my = event.motion.y;
+            
+            if (isDraggingVolume) {
+                // Äâèãàåì ìûøü ïî ñëàéäåðó — ìåíÿåì ãðîìêîñòü è ïîçèöèþ êðóæêà
+                UpdateVolumeFromMouse(mx, my);
+            }
             if (Environment::tapDownHold) {
                 // Îáíîâëåíèå òåêóùåé ïîçèöèè, åñëè êíîïêà óäåðæèâàåòñÿ
                 Environment::tapDownCurrentPos.v[0] = event.motion.x;

Game.h

@@ -32,6 +32,7 @@ private:
     void drawCubemap();
     void drawShip();
     void drawBoxes();
+    void drawUI();
 
     SDL_Window* window;
     SDL_GLContext glContext;
@@ -55,7 +56,28 @@ private:
 
     std::vector<BoxCoords> boxCoordsArr;
     std::vector<VertexRenderStruct> boxRenderArr;
+    
 
+    std::shared_ptr<Texture> buttonTexture;
+    VertexRenderStruct button;
+
+    std::shared_ptr<Texture> musicVolumeBarTexture;
+    VertexRenderStruct musicVolumeBar;
+
+    std::shared_ptr<Texture> musicVolumeBarButtonTexture;
+    VertexRenderStruct musicVolumeBarButton;
+
+
+    bool isDraggingVolume = false;
+    float musicVolume = 1.0f;
+    float volumeBarMinX = 1190.0f;
+    float volumeBarMaxX = 1200.0f;
+    float volumeBarMinY = 100.0f;
+    float volumeBarMaxY = 600.0f;
+    float musicVolumeBarButtonButtonCenterX = 1195.0f;
+    float musicVolumeBarButtonButtonRadius = 25.0f;
+    void UpdateVolumeFromMouse(int mouseX, int mouseY);
+    void UpdateVolumeKnob();
 };
 
 } // namespace ZL

Readme.md

@@ -148,7 +148,7 @@ embuilder build sdl2 sdl2_ttf sdl2_image sdl2_image_jpg sdl2_image_png
 
 
 
-emcc main.cpp Game.cpp Environment.cpp BoneAnimatedModel.cpp Math.cpp Renderer.cpp TextModel.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp OpenGlExtensions.cpp -O2 -std=c++14 -pthread -sUSE_PTHREADS=1 -sPTHREAD_POOL_SIZE=4 -sTOTAL_MEMORY=4294967296 -sINITIAL_MEMORY=3221225472 -sMAXIMUM_MEMORY=4294967296 -sALLOW_MEMORY_GROWTH=1 -I./thirdparty/libzip-1.11.3/build-emcmake/install/include -L./thirdparty/libzip-1.11.3/build-emcmake/install/lib -lzip -lz -sUSE_SDL_IMAGE=2 -sUSE_SDL=2 -sUSE_LIBPNG=1 --preload-file space-game001.zip -o space-game001.html
+emcc main.cpp Game.cpp Environment.cpp BoneAnimatedModel.cpp ZLMath.cpp Renderer.cpp TextModel.cpp ShaderManager.cpp TextureManager.cpp Utils.cpp OpenGlExtensions.cpp -O2 -std=c++14 -pthread -sUSE_PTHREADS=1 -sPTHREAD_POOL_SIZE=4 -sTOTAL_MEMORY=4294967296 -sINITIAL_MEMORY=3221225472 -sMAXIMUM_MEMORY=4294967296 -sALLOW_MEMORY_GROWTH=1 -I./thirdparty/libzip-1.11.3/build-emcmake/install/include -L./thirdparty/libzip-1.11.3/build-emcmake/install/lib -lzip -lz -sUSE_SDL_IMAGE=2 -sUSE_SDL=2 -sUSE_LIBPNG=1 --preload-file space-game001.zip -o space-game001.html
 
 emrun --no_browser --port 8080 .
 ```