From 1aed3d0d3c86896077b940dbfa022e0f3a790794 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Sat, 20 Apr 2024 22:38:43 +0300 Subject: [PATCH] Simplify Cone Etc Mesh (still not implemented) --- src/CRE/mdl/disp_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index ce09cedd..107b0127 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -1691,6 +1691,8 @@ namespace mdl { case mdl::ETC_OBJ_CONE: { EtcObjCone& cone = etc->data.cone; + mat4_scale_rot(&mat, cone.base, cone.height, cone.base, &mat); + indexed = true; wire = cone.wire; } break; @@ -3121,9 +3123,7 @@ namespace mdl { return i.vertex_array; case mdl::ETC_OBJ_CONE: if (i.data.cone.slices == etc->data.cone.slices - && i.data.cone.stacks == etc->data.cone.stacks - && fabsf(i.data.cone.base - etc->data.cone.base) < 0.00001f - && fabsf(i.data.cone.height - etc->data.cone.height) < 0.00001f) + && i.data.cone.stacks == etc->data.cone.stacks) return i.vertex_array; break; case mdl::ETC_OBJ_LINE: