From 4cb3566906a070da8104f7ef8a4574e22ea3839e Mon Sep 17 00:00:00 2001
From: Kearwood Gilbert <kearwood@kearwood.com>
Date: Mon, 28 Feb 2022 21:27:25 -0800
Subject: [PATCH] Test shader now using vertex buffer.  Fixed CMake script so
 that shaders are now recompiled and re-bundled without having to re-building
 Kraken SDK.

---
 kraken/KRMeshManager.cpp                 | 22 ----------------------
 kraken/KRPointLight.cpp                  |  3 ---
 standard_assets/shaders/vulkan_test.vert |  2 +-
 tests/smoke/hello_cube/CMakeLists.txt    |  1 +
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp
index 88d5fc1..3031219 100755
--- a/kraken/KRMeshManager.cpp
+++ b/kraken/KRMeshManager.cpp
@@ -690,28 +690,6 @@ float KRMeshManager::KRVBOData::getStreamPriority()
 
 void KRMeshManager::KRVBOData::_swapHandles()
 {
-    // TODO - Replace OpenGL code below...
-  /*
-    if(m_is_vbo_loaded) {
-        assert(m_vbo_handle != -1);
-    }
-    
-#if GL_OES_vertex_array_object
-    if(m_is_vbo_loaded && m_vao_handle == -1) {
-        GLDEBUG(glGenVertexArraysOES(1, &m_vao_handle));
-        GLDEBUG(glBindVertexArrayOES(m_vao_handle));
-        
-        GLDEBUG(glBindBuffer(GL_ARRAY_BUFFER, m_vbo_handle));
-        KRMeshManager::configureAttribs(m_vertex_attrib_flags);
-        if(m_vbo_handle_indexes == -1) {
-            GLDEBUG(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
-        } else {
-            GLDEBUG(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_vbo_handle_indexes));
-        }
-    }
-#endif
-*/
-    
     m_is_vbo_ready = m_is_vbo_loaded;
 }
 
diff --git a/kraken/KRPointLight.cpp b/kraken/KRPointLight.cpp
index 0f107af..1bcb128 100755
--- a/kraken/KRPointLight.cpp
+++ b/kraken/KRPointLight.cpp
@@ -127,9 +127,6 @@ void KRPointLight::render(VkCommandBuffer& commandBuffer, KRCamera *pCamera, std
                     m_pContext->getMeshManager()->bindVBO(commandBuffer, &m_pContext->getMeshManager()->KRENGINE_VBO_DATA_2D_SQUARE_VERTICES, 1.0f);
                     GLDEBUG(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
                 } else {
-#if GL_OES_vertex_array_object
-                    GLDEBUG(glBindVertexArrayOES(0));
-#endif
                     // Render sphere of light's influence
                     generateMesh();
                 
diff --git a/standard_assets/shaders/vulkan_test.vert b/standard_assets/shaders/vulkan_test.vert
index 3158429..b01c423 100644
--- a/standard_assets/shaders/vulkan_test.vert
+++ b/standard_assets/shaders/vulkan_test.vert
@@ -21,6 +21,6 @@ vec3 colors[3] = vec3[](
 );
 
 void main() {
-    gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0);
+    gl_Position = vec4(vertex_position * 0.5, 1.0);
     fragColor = colors[gl_VertexIndex];
 }
diff --git a/tests/smoke/hello_cube/CMakeLists.txt b/tests/smoke/hello_cube/CMakeLists.txt
index 1787a15..e820048 100644
--- a/tests/smoke/hello_cube/CMakeLists.txt
+++ b/tests/smoke/hello_cube/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(KRAKEN_CUBE_BUNDLE "${CMAKE_BINARY_DIR}/output/tests/kraken_cube.krbundle")
 add_custom_command(
     OUTPUT ${KRAKEN_CUBE_BUNDLE}
     COMMAND kraken_convert -o ${KRAKEN_CUBE_BUNDLE} ${STANDARD_ASSET_BUNDLE}
+    MAIN_DEPENDENCY ${STANDARD_ASSET_BUNDLE}
     DEPENDS kraken_convert kraken_sdk
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	COMMENT "Creating Cube Test Assets"