Changeset 1504Tweet

Timestamp:

Jun 21, 2012, 12:39:30 AM (11 years ago)

Author:

touky

Message:

Mesh : Added negative chamfer on AppendBox support, so chamfer doesn't increase boxes size.
Lolnament : Small tweaks mirroring what's said above.

Location:

trunk/orbital

Files:

• Lolnament.h (modified) (3 diffs)
• mesh.h (modified) (1 diff)

trunk/orbital/Lolnament.h

@@ -170 +170 @@
       : m_ready(false)
     {
-                m_ref_mesh.Compile( "[sc#f80 afcb8 6 6 1]"
-                                                        "[sc#bbd afcb6 8 6 1]"
-                                                        "[sc#44d afcb6 6 8 1]");
+                m_ref_mesh.Compile( "[sc#f80 afcb10 8 8 -1]"
+                                                        "[sc#bbd afcb8 10 8 -1]"
+                                                        "[sc#44d afcb8 8 10 -1]");
 
                 wave_angle = 0.0f;
@@ -179 +179 @@
                 m_influence_list << (influence_infos(0.0f, false, false, INF_WAVE)
                                                                 << point_infos_Part(OFF_DEF, vec3(.0f), vec3(.0f), .0f, vec3(.0f), .0f, 1.2f));
-                m_influence_list << (influence_infos(0.3f, true, false)
-                                                                << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
-                m_influence_list << (influence_infos(0.7f, true, false)
-                                                                << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
+                //m_influence_list << (influence_infos(0.3f, true, false)
+                //                                              << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
+                //m_influence_list << (influence_infos(0.7f, true, false)
+                //                                              << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
                 m_influence_list << (influence_infos(1.0f)
-                                                                << point_infos_Part(OFF_DEF, vec3(.0f, 80.0f, .0f), vec3(.0f, .0f, 90.0f), .0f, vec3(2.0f, .0f, .0f))
+                                                                << point_infos_Part(OFF_DEF, vec3(.0f, 80.0f, .0f), vec3(.0f, .0f, 90.0f), .0f, vec3(2.0f, .0f, .0f), .0f, .2f)
                                                                 /*
                                                                 << point_infos_Part(RND_MIN, vec3(-40.0f, .0f, -40.0f), vec3(.0f))
@@ -218 +218 @@
                         debug_point_angle -= M_PI * 2.0f;
 
-                m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(cos(debug_point_angle) * DEF_X, 0, sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
+                //m_influence_point_list << influencing_point_infos(BLD_SPHERE, vec3(cos(debug_point_angle) * DEF_X, 0, sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
                 m_influence_point_list << influencing_point_infos(BLD_SQUARE, vec3(-cos(debug_point_angle) * DEF_X, 0, -sin(debug_point_angle) * DEF_Z) * DEF_SIZE * 0.3f, 1.0f);
 

trunk/orbital/mesh.h

@@ -407 +407 @@
     void AppendBox(vec3 const &size, float chamf, bool smooth)
     {
+                if (chamf < 0.0f)
+                {
+                        AppendBox(size + vec3(chamf * 2.0f), -chamf, smooth);
+                        return;
+                }
         int vbase = m_vert.Count();
         int qibase = m_quadidx.Count();