Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-01 19:28:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small tweaks

Browse Source
This commit is contained in:
korenkonder
2023-11-27 22:24:49 +03:00
parent 664bc34352
commit d05262deea
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/object.cpp
+2 -5
View File
@@ -215,8 +215,7 @@ void* obj_mesh_vertex_buffer::fill_data(void* data, obj_mesh& mesh) {
obj_vertex_data* vtx = mesh.vertex_array;
uint32_t num_vertex = mesh.num_vertex;
size_t d = (size_t)data;
if (!mesh.attrib.m.compressed) {
size_t size = (size_t)num_vertex * mesh.size_vertex;
if (!mesh.attrib.m.compressed)
for (uint32_t i = num_vertex; i; i--, vtx++) {
if (vertex_format & OBJ_VERTEX_POSITION) {
*(vec3*)d = vtx->position;
@@ -280,8 +279,7 @@ void* obj_mesh_vertex_buffer::fill_data(void* data, obj_mesh& mesh) {
d += 16;
}
}
}
else {
else
for (uint32_t i = num_vertex; i; i--, vtx++) {
if (vertex_format & OBJ_VERTEX_POSITION) {
*(vec3*)d = vtx->position;
@@ -336,7 +334,6 @@ void* obj_mesh_vertex_buffer::fill_data(void* data, obj_mesh& mesh) {
d += 8;
}
}
}
return (void*)d;
}
src/KKdLib/obj.cpp
+4 -4
View File
@@ -368,8 +368,8 @@ obj_material_data::obj_material_data() : num_of_textures() {
}
obj_sub_mesh::obj_sub_mesh() : flags(), bounding_sphere(), material_index(), uv_index(), bone_index_array(),
num_bone_index(), bones_per_vertex(), primitive_type(), index_format(), index_array(), num_index(),
obj_sub_mesh::obj_sub_mesh() : flags(), bounding_sphere(), material_index(), uv_index(), num_bone_index(),
bone_index_array(), bones_per_vertex(), primitive_type(), index_format(), num_index(), index_array(),
attrib(), axis_aligned_bounding_box(), first_index(), last_index(), index_offset() {
}
@@ -490,8 +490,8 @@ obj_skin::obj_skin() : bone_array(), num_bone(), ex_data() {
}
obj::obj() : mesh_array(), num_mesh(), material_array(),
num_material(), flags(), reserved(), skin(), name(), id() {
obj::obj() : num_mesh(), mesh_array(), num_material(),
material_array(), flags(), reserved(), skin(), name(), id() {
hash = hash_murmurhash_empty;
}
src/KKdLib/obj.hpp
+5 -5
View File
@@ -78,7 +78,7 @@ enum obj_material_texture_coordinate_translation_type : uint32_t {
OBJ_MATERIAL_TEXTURE_COORDINATE_TRANSLATION_NONE = 0x00,
OBJ_MATERIAL_TEXTURE_COORDINATE_TRANSLATION_UV = 0x01,
OBJ_MATERIAL_TEXTURE_COORDINATE_TRANSLATION_SPHERE = 0x02,
OBJ_MATERIAL_TEXTURE_COORDINATE_TRANSLATION_CUBE = 0x03
OBJ_MATERIAL_TEXTURE_COORDINATE_TRANSLATION_CUBE = 0x03,
};
enum obj_material_vertex_translation_type : uint32_t {
@@ -347,13 +347,13 @@ struct obj_sub_mesh {
obj_bounding_sphere bounding_sphere;
uint32_t material_index;
uint8_t uv_index[8];
uint16_t* bone_index_array;
uint32_t num_bone_index;
uint16_t* bone_index_array;
uint32_t bones_per_vertex;
obj_primitive_type primitive_type;
obj_index_format index_format;
uint32_t* index_array;
uint32_t num_index;
uint32_t* index_array;
obj_sub_mesh_attrib attrib;
union {
obj_axis_aligned_bounding_box axis_aligned_bounding_box;
@@ -679,10 +679,10 @@ struct obj_skin {
struct obj {
obj_bounding_sphere bounding_sphere;
obj_mesh* mesh_array;
uint32_t num_mesh;
obj_material_data* material_array;
obj_mesh* mesh_array;
uint32_t num_material;
obj_material_data* material_array;
uint8_t flags;
uint32_t reserved[10];
obj_skin* skin;