From b49f8d7de53d687d1a5beceab2c034c8e244c202 Mon Sep 17 00:00:00 2001
From: korenkonder <admin@mysterious-home.net>
Date: Sat, 20 Apr 2024 22:39:52 +0300
Subject: [PATCH] Simplify Cone Etc Mesh (still not implemented)

---
 src/DivaGL/mdl/disp_manager.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/DivaGL/mdl/disp_manager.cpp b/src/DivaGL/mdl/disp_manager.cpp
index 30a1850..e73bba7 100644
--- a/src/DivaGL/mdl/disp_manager.cpp
+++ b/src/DivaGL/mdl/disp_manager.cpp
@@ -1192,6 +1192,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;
@@ -1236,8 +1238,6 @@ namespace mdl {
                 || type == mdl::ETC_OBJ_CONE
                 && 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
                 || type == mdl::ETC_OBJ_LINE
                 && fabsf(vec3::distance(i.data.line.pos[0], i.data.line.pos[1]) - length) < 0.00001f
                 || type == mdl::ETC_OBJ_CROSS)
@@ -2572,9 +2572,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: