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

Fixed bug breaking writing and parsing of new mesh format
Some checks failed
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, macos-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Kearwood Gilbert
2026-06-14 16:01:04 -07:00
parent 38cdbb6ce5
commit 130fb5cbe8
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kraken/resources/mesh/KRMesh.cpp
View File

@@ -608,10 +608,11 @@ void KRMesh::LoadData(const KRMesh::mesh_info& mi, bool calculate_normals, bool
attribute->normalization = Normalization::none; attribute->normalization = Normalization::none;
attribute++; attribute++;
} }
for (int i = 0; i < kMaxAttributes; i++) { for (int i = 0; i < kMaxAttributes && primitive.layout.attributes[i].component != ComponentType::empty; i++) {
primitive.layout.offsets[i] = primitive.layout.vertexSize; primitive.layout.offsets[i] = primitive.layout.vertexSize;
int componentSize = ComponentSize[(int)primitive.layout.attributes[i].component] * DataTypeComponentCount[(int)primitive.layout.attributes[i].type]; int componentSize = ComponentSize[(int)primitive.layout.attributes[i].component] * DataTypeComponentCount[(int)primitive.layout.attributes[i].type];
primitive.layout.vertexSize += componentSize; primitive.layout.vertexSize += componentSize;
} }
primitive.layout.topology = mi.format; primitive.layout.topology = mi.format;
@@ -829,7 +830,7 @@ int KRMesh::getAttributeIndex(const PrimitiveInfo& primitive, VertexAttribute at
int indexLeft = index; int indexLeft = index;
for (int i = 0; i < kMaxAttributes; i++) { for (int i = 0; i < kMaxAttributes; i++) {
VertexAttributeInfo info = primitive.layout.attributes[i]; VertexAttributeInfo info = primitive.layout.attributes[i];
if (info.attribute == VertexAttribute::position) { if (info.component == ComponentType::empty) {
break; break;
} }
if (info.attribute == attribute) { if (info.attribute == attribute) {
@@ -1013,37 +1014,37 @@ void writeVertexAttributeComponent(const VertexAttributeInfo& attribute, void* a
case ComponentType::empty: case ComponentType::empty:
break; break;
case ComponentType::int8: case ComponentType::int8:
normalizeAttributeComponent(attribute.normalization, val, (__int8_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__int8_t*)componentAddress);
break; break;
case ComponentType::uint8: case ComponentType::uint8:
normalizeAttributeComponent(attribute.normalization, val, (__uint8_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__uint8_t*)componentAddress);
break; break;
case ComponentType::int16: case ComponentType::int16:
normalizeAttributeComponent(attribute.normalization, val, (__int16_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__int16_t*)componentAddress);
break; break;
case ComponentType::uint16: case ComponentType::uint16:
normalizeAttributeComponent(attribute.normalization, val, (__uint16_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__uint16_t*)componentAddress);
break; break;
case ComponentType::int32: case ComponentType::int32:
normalizeAttributeComponent(attribute.normalization, val, (__int32_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__int32_t*)componentAddress);
break; break;
case ComponentType::uint32: case ComponentType::uint32:
normalizeAttributeComponent(attribute.normalization, val, (__uint32_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__uint32_t*)componentAddress);
break; break;
case ComponentType::int64: case ComponentType::int64:
normalizeAttributeComponent(attribute.normalization, val, (__int64_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__int64_t*)componentAddress);
break; break;
case ComponentType::uint64: case ComponentType::uint64:
normalizeAttributeComponent(attribute.normalization, val, (__uint64_t*)address); normalizeAttributeComponent(attribute.normalization, val, (__uint64_t*)componentAddress);
break; break;
case ComponentType::float16: case ComponentType::float16:
normalizeAttributeComponent(attribute.normalization, val, (short*)address); normalizeAttributeComponent(attribute.normalization, val, (short*)componentAddress);
break; break;
case ComponentType::float32: case ComponentType::float32:
normalizeAttributeComponent(attribute.normalization, val, (float*)address); normalizeAttributeComponent(attribute.normalization, val, (float*)componentAddress);
break; break;
case ComponentType::float64: case ComponentType::float64:
normalizeAttributeComponent(attribute.normalization, val, (double*)address); normalizeAttributeComponent(attribute.normalization, val, (double*)componentAddress);
break; break;
} }
} }
@@ -1055,37 +1056,37 @@ void readVertexAttributeComponent(const VertexAttributeInfo& attribute, const vo
case ComponentType::empty: case ComponentType::empty:
break; break;
case ComponentType::int8: case ComponentType::int8:
denormalizeAttributeComponent(attribute.normalization, *(__int8_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__int8_t*)componentAddress, out);
break; break;
case ComponentType::uint8: case ComponentType::uint8:
denormalizeAttributeComponent(attribute.normalization, *(__uint8_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__uint8_t*)componentAddress, out);
break; break;
case ComponentType::int16: case ComponentType::int16:
denormalizeAttributeComponent(attribute.normalization, *(__int16_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__int16_t*)componentAddress, out);
break; break;
case ComponentType::uint16: case ComponentType::uint16:
denormalizeAttributeComponent(attribute.normalization, *(__uint16_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__uint16_t*)componentAddress, out);
break; break;
case ComponentType::int32: case ComponentType::int32:
denormalizeAttributeComponent(attribute.normalization, *(__int32_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__int32_t*)componentAddress, out);
break; break;
case ComponentType::uint32: case ComponentType::uint32:
denormalizeAttributeComponent(attribute.normalization, *(__uint32_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__uint32_t*)componentAddress, out);
break; break;
case ComponentType::int64: case ComponentType::int64:
denormalizeAttributeComponent(attribute.normalization, *(__int64_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__int64_t*)componentAddress, out);
break; break;
case ComponentType::uint64: case ComponentType::uint64:
denormalizeAttributeComponent(attribute.normalization, *(__uint64_t*)address, out); denormalizeAttributeComponent(attribute.normalization, *(__uint64_t*)componentAddress, out);
break; break;
case ComponentType::float16: case ComponentType::float16:
denormalizeAttributeComponent(attribute.normalization, *(short*)address, out); denormalizeAttributeComponent(attribute.normalization, *(short*)componentAddress, out);
break; break;
case ComponentType::float32: case ComponentType::float32:
denormalizeAttributeComponent(attribute.normalization, *(float*)address, out); denormalizeAttributeComponent(attribute.normalization, *(float*)componentAddress, out);
break; break;
case ComponentType::float64: case ComponentType::float64:
denormalizeAttributeComponent(attribute.normalization, *(double*)address, out); denormalizeAttributeComponent(attribute.normalization, *(double*)componentAddress, out);
break; break;
} }
} }