Tracking latest axmol

Author: halx99

CMakeLists.txt

@@ -21,4 +21,4 @@ endif()
 
 target_include_directories(${target_name} PUBLIC "runtime/include")
 
-setup_cocos_extension_config(${target_name})
+setup_ax_extension_config(${target_name})

SkeletonBatch.cpp

@@ -98,10 +98,10 @@ backend::ProgramState* SkeletonBatch::updateCommandPipelinePS(SkeletonCommand* c
 		auto locPosition = currentState->getAttributeLocation(backend::ATTRIBUTE_NAME_POSITION);
 		auto locTexcoord = currentState->getAttributeLocation(backend::ATTRIBUTE_NAME_TEXCOORD);
 		auto locColor = currentState->getAttributeLocation(backend::ATTRIBUTE_NAME_COLOR);
-		vertexLayout->setAttribute(backend::ATTRIBUTE_NAME_POSITION, locPosition, backend::VertexFormat::FLOAT3, offsetof(V3F_C4B_T2F, vertices), false);
-		vertexLayout->setAttribute(backend::ATTRIBUTE_NAME_TEXCOORD, locColor, backend::VertexFormat::UBYTE4, offsetof(V3F_C4B_T2F, colors), true);
-		vertexLayout->setAttribute(backend::ATTRIBUTE_NAME_COLOR, locTexcoord, backend::VertexFormat::FLOAT2, offsetof(V3F_C4B_T2F, texCoords), false);
-		vertexLayout->setLayout(sizeof(_vertices[0]));
+		currentState->setVertexAttrib(backend::ATTRIBUTE_NAME_POSITION, locPosition, backend::VertexFormat::FLOAT3, offsetof(V3F_C4B_T2F, vertices), false);
+		currentState->setVertexAttrib(backend::ATTRIBUTE_NAME_TEXCOORD, locColor, backend::VertexFormat::UBYTE4, offsetof(V3F_C4B_T2F, colors), true);
+		currentState->setVertexAttrib(backend::ATTRIBUTE_NAME_COLOR, locTexcoord, backend::VertexFormat::FLOAT2, offsetof(V3F_C4B_T2F, texCoords), false);
+        currentState->setVertexStride(sizeof(_vertices[0]));
 
 
 		command->_locMVP = currentState->getUniformLocation(backend::UNIFORM_NAME_MVP_MATRIX);

SkeletonTwoColorBatch.cpp

@@ -108,11 +108,11 @@ namespace {
 		auto locColor = programState->getAttributeLocation("a_color");
 		auto locColor2 = programState->getAttributeLocation("a_color2");
 
-		layout->setAttribute("a_position", locPosition, backend::VertexFormat::FLOAT3, offsetof(spine::V3F_C4B_C4B_T2F, position), false);
-		layout->setAttribute("a_color", locColor, backend::VertexFormat::UBYTE4, offsetof(spine::V3F_C4B_C4B_T2F, color), true);
-		layout->setAttribute("a_color2", locColor2, backend::VertexFormat::UBYTE4, offsetof(spine::V3F_C4B_C4B_T2F, color2), true);
-		layout->setAttribute("a_texCoords", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(spine::V3F_C4B_C4B_T2F, texCoords), false);
-		layout->setLayout(sizeof(spine::V3F_C4B_C4B_T2F));
+		programState->setVertexAttrib("a_position", locPosition, backend::VertexFormat::FLOAT3, offsetof(spine::V3F_C4B_C4B_T2F, position), false);
+		programState->setVertexAttrib("a_color", locColor, backend::VertexFormat::UBYTE4, offsetof(spine::V3F_C4B_C4B_T2F, color), true);
+		programState->setVertexAttrib("a_color2", locColor2, backend::VertexFormat::UBYTE4, offsetof(spine::V3F_C4B_C4B_T2F, color2), true);
+		programState->setVertexAttrib("a_texCoords", locTexcoord, backend::VertexFormat::FLOAT2, offsetof(spine::V3F_C4B_C4B_T2F, texCoords), false);
+		programState->setVertexStride(sizeof(spine::V3F_C4B_C4B_T2F));
 	}
 
 	static void initTwoColorProgramState() {