Changeset 1441


Ignore:
Timestamp:
Jun 5, 2012, 8:15:59 PM (8 years ago)
Author:
sam
Message:

orbital: some tuning here and there.

Location:
trunk/orbital
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/orbital.cpp

    r1434 r1441  
    188188#endif
    189189
     190#if 0
    190191        vec3 new_camera_pos = vec3(0,0,0);
    191192
     
    203204        m_camera->SetPosition(new_camera_pos + vec3(0.f, 600.f, 0.f));
    204205        m_camera->SetTarget(new_camera_pos);
     206#endif
    205207
    206208    m_model = mat4(1.f);
  • trunk/orbital/player.h

    r1434 r1441  
    164164
    165165        if (m_type == 0)
    166             m_position += vec3(rightleft, 0.f, -updown) * 200.f * seconds;
    167         else
    168             m_position += vec3(rightleft, 0.f, -updown) * 140.f * seconds;
     166            m_position += vec3(rightleft, 0.f, -updown) * 340.f * seconds;
     167        else
     168            m_position += vec3(rightleft, 0.f, -updown) * 240.f * seconds;
    169169    }
    170170
     
    198198            mat4 t = mat4::translate(m_options[i].m1);
    199199
    200             bool fire = m_stick && m_stick->GetButtonCount() >= 4
     200            bool fire = m_stick && m_stick->GetButtonCount() >= 12
    201201                                && m_stick->GetButton(12);
    202202            fire = fire || Input::GetButtonState(305 /* Right Ctrl */);
  • trunk/orbital/shiny.lolfx

    r1392 r1441  
    11
    22-- GLSL.Vert --
    3 
    4 #version 120
     3#version 100
    54
    65attribute vec3 in_Vertex;
     
    1716    /* Material properties */
    1817    vec3 specular_reflect = vec3(0.8, 0.75, 0.4);
    19     float specular_power = 60.f;
     18    float specular_power = 60.0;
    2019
    2120    /* World properties */
    22     float ambient_mul = 0.5f;
     21    float ambient_mul = 0.5;
    2322    vec3 light_dir = normalize(vec3(0.3, 0.3, 0.7));
    2423    vec3 ambient_color = vec3(0.25, 0.2, 0.35);
     
    4948
    5049-- GLSL.Frag --
     50#version 100
    5151
    52 #version 120
    53 
     52precision highp float;
    5453varying vec4 pass_Color;
    5554
     
    7170{
    7271    float3 specular_reflect = float3(0.8, 0.75, 0.4);
    73     float specular_power = 60.f;
    74     float ambient_mul = 0.5f;
     72    float specular_power = 60.0;
     73    float ambient_mul = 0.5;
    7574    float3 light_dir = normalize(float3(0.3, 0.3, 0.7));
    7675    float3 ambient_color = float3(0.25, 0.2, 0.35);
  • trunk/orbital/snake.h

    r1434 r1441  
    7979        WorldEntity::TickGame(seconds);
    8080
    81         m_steer += 2.f * seconds;
     81        m_steer += 4.f * seconds;
    8282
    8383        /* Destruction test */
    8484        if (!m_stick)
    8585            m_stick = Input::TrackStick();
    86         bool fire = m_stick && m_stick->GetButtonCount() >= 4
     86        bool fire = m_stick && m_stick->GetButtonCount() >= 12
    8787                            && m_stick->GetButton(12);
    8888        fire = fire || Input::GetButtonState(305 /* Right Ctrl */);
     
    9494        }
    9595
    96         float test = sinf(m_steer) * 100.f + 30.f;
     96        float test = sinf(m_steer) * 200.f + 60.f;
    9797        m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
    9898
    99         m_velocity = 60.f * m_rotation.transform(vec3(0, 0, 1));
     99        m_velocity = 120.f * m_rotation.transform(vec3(0, 0, 1));
    100100        vec3 deltapos = seconds * m_velocity;
    101101        m_position += deltapos;
     
    129129            {
    130130                new_delta /= new_distance;
    131                 new_distance = std::max(12.f, new_distance - seconds * 80.f);
     131                new_distance = std::max(12.f, new_distance - seconds * 160.f);
    132132                new_delta *= new_distance;
    133133            }
Note: See TracChangeset for help on using the changeset viewer.