kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Kearwood Gilbert
2022-02-28 21:27:25 -08:00
parent b34ba9b096
commit 4cb3566906
4 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kraken/KRMeshManager.cpp
View File

@@ -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;
}

3
kraken/KRPointLight.cpp
View File

@@ -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();

2
standard_assets/shaders/vulkan_test.vert
View File

@@ -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];
}

1
tests/smoke/hello_cube/CMakeLists.txt
View File

@@ -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"