Changeset 2153


Ignore:
Timestamp:
Dec 19, 2012, 10:11:14 PM (7 years ago)
Author:
sam
Message:

easymesh: make demo objects smaller.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tutorial/05_easymesh.cpp

    r2152 r2153  
    2929        m_gears.Push(EasyMesh(), mat4(1.0f), 180.0f / 18);
    3030
    31         m_gears[0].m1.Compile("sc#f9f scb#f9f acg 12 10 5 5 20 20 5 5 0.1 0");
    32         m_gears[1].m1.Compile("sc#ff9 scb#ff9 acg 54 10 95 95 90 90 -5 -5 0.1 0");
    33         m_gears[2].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0");
    34         m_gears[3].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0");
    35         m_gears[4].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0");
     31        m_gears[0].m1.Compile("sc#f9f scb#f9f acg 12 10 5 5 20 20 5 5 0.1 0 s .1 .1 .1");
     32        m_gears[1].m1.Compile("sc#ff9 scb#ff9 acg 54 10 95 95 90 90 -5 -5 0.1 0 s .1 .1 .1");
     33        m_gears[2].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0 s .1 .1 .1");
     34        m_gears[3].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0 s .1 .1 .1");
     35        m_gears[4].m1.Compile("sc#9ff scb#9ff acg 18 10 5 5 30 30 5 5 0.1 0 s .1 .1 .1");
    3636
    3737        m_angle = 0;
     
    4141                              vec3(0, 1, 0));
    4242        m_camera->SetPerspective(70.f, 960.f, 600.f, .1f, 1000.f);
    43         m_camera->SetTarget(vec3(0.f, -10.f, 0.f));
    44         m_camera->SetPosition(vec3(-150.f, 100.f, 0.f));
     43        m_camera->SetTarget(vec3(0.f, -1.f, 0.f));
     44        m_camera->SetPosition(vec3(-15.f, 10.f, 0.f));
    4545        Ticker::Ref(m_camera);
    4646
     
    7171        m_gears[1].m2 = mat4::translate(vec3(0, 0, 0))
    7272                      * mat4::rotate(m_gears[1].m3, vec3(0, 1, 0));
    73         m_gears[2].m2 = mat4::translate(vec3(0, 0, 55))
     73        m_gears[2].m2 = mat4::translate(vec3(0, 0, 5.5f))
    7474                      * mat4::rotate(m_gears[2].m3, vec3(0, 1, 0));
    75         m_gears[3].m2 = mat4::translate(vec3(55 * lol::sqrt(3.f) * 0.5f, 0, -55 * 0.5f))
     75        m_gears[3].m2 = mat4::translate(vec3(5.5f * lol::sqrt(3.f) * 0.5f, 0, -5.5f * 0.5f))
    7676                      * mat4::rotate(m_gears[3].m3, vec3(0, 1, 0));
    77         m_gears[4].m2 = mat4::translate(vec3(-55 * lol::sqrt(3.f) * 0.5f, 0, -55 * 0.5f))
     77        m_gears[4].m2 = mat4::translate(vec3(-5.5f * lol::sqrt(3.f) * 0.5f, 0, -5.5f * 0.5f))
    7878                      * mat4::rotate(m_gears[4].m3, vec3(0, 1, 0));
    7979    }
Note: See TracChangeset for help on using the changeset viewer.