Changeset 1504


Ignore:
Timestamp:
Jun 21, 2012, 12:39:30 AM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/Lolnament.h

    r1501 r1504  
    170170      : m_ready(false)
    171171    {
    172                 m_ref_mesh.Compile( "[sc#f80 afcb8 6 6 1]"
    173                                                         "[sc#bbd afcb6 8 6 1]"
    174                                                         "[sc#44d afcb6 6 8 1]");
     172                m_ref_mesh.Compile( "[sc#f80 afcb10 8 8 -1]"
     173                                                        "[sc#bbd afcb8 10 8 -1]"
     174                                                        "[sc#44d afcb8 8 10 -1]");
    175175
    176176                wave_angle = 0.0f;
     
    179179                m_influence_list << (influence_infos(0.0f, false, false, INF_WAVE)
    180180                                                                << point_infos_Part(OFF_DEF, vec3(.0f), vec3(.0f), .0f, vec3(.0f), .0f, 1.2f));
    181                 m_influence_list << (influence_infos(0.3f, true, false)
    182                                                                 << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
    183                 m_influence_list << (influence_infos(0.7f, true, false)
    184                                                                 << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
     181                //m_influence_list << (influence_infos(0.3f, true, false)
     182                //                                              << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
     183                //m_influence_list << (influence_infos(0.7f, true, false)
     184                //                                              << point_infos_Part(OFF_DEF, vec3(.0f, 40.0f, .0f), vec3(.0f, 90.0f, .0f)));
    185185                m_influence_list << (influence_infos(1.0f)
    186                                                                 << point_infos_Part(OFF_DEF, vec3(.0f, 80.0f, .0f), vec3(.0f, .0f, 90.0f), .0f, vec3(2.0f, .0f, .0f))
     186                                                                << point_infos_Part(OFF_DEF, vec3(.0f, 80.0f, .0f), vec3(.0f, .0f, 90.0f), .0f, vec3(2.0f, .0f, .0f), .0f, .2f)
    187187                                                                /*
    188188                                                                << point_infos_Part(RND_MIN, vec3(-40.0f, .0f, -40.0f), vec3(.0f))
     
    218218                        debug_point_angle -= M_PI * 2.0f;
    219219
    220                 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);
     220                //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);
    221221                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);
    222222
  • trunk/orbital/mesh.h

    r1442 r1504  
    407407    void AppendBox(vec3 const &size, float chamf, bool smooth)
    408408    {
     409                if (chamf < 0.0f)
     410                {
     411                        AppendBox(size + vec3(chamf * 2.0f), -chamf, smooth);
     412                        return;
     413                }
    409414        int vbase = m_vert.Count();
    410415        int qibase = m_quadidx.Count();
Note: See TracChangeset for help on using the changeset viewer.