Changeset 1433


Ignore:
Timestamp:
May 31, 2012, 7:24:57 PM (8 years ago)
Author:
sam
Message:

orbital: use hexadecimal colour commands everywhere.

Location:
trunk/orbital
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/gun.cpp

    r1424 r1433  
    99#if defined HAVE_CONFIG_H
    1010#   include "config.h"
     11#endif
     12
     13#if defined _XBOX
     14#   define _USE_MATH_DEFINES /* for M_PI */
     15#   include <xtl.h>
     16#   undef near /* Fuck Microsoft */
     17#   undef far /* Fuck Microsoft again */
     18#elif defined _WIN32
     19#   define _USE_MATH_DEFINES /* for M_PI */
     20#   define WIN32_LEAN_AND_MEAN
     21#   include <windows.h>
     22#   undef near /* Fuck Microsoft */
     23#   undef far /* Fuck Microsoft again */
     24#else
     25#   include <cmath>
    1126#endif
    1227
  • trunk/orbital/mesh.cpp

    r1424 r1433  
    99#if defined HAVE_CONFIG_H
    1010#   include "config.h"
     11#endif
     12
     13#if defined _XBOX
     14#   define _USE_MATH_DEFINES /* for M_PI */
     15#   include <xtl.h>
     16#   undef near /* Fuck Microsoft */
     17#   undef far /* Fuck Microsoft again */
     18#elif defined _WIN32
     19#   define _USE_MATH_DEFINES /* for M_PI */
     20#   define WIN32_LEAN_AND_MEAN
     21#   include <windows.h>
     22#   undef near /* Fuck Microsoft */
     23#   undef far /* Fuck Microsoft again */
     24#else
     25#   include <cmath>
    1126#endif
    1227
  • trunk/orbital/player.h

    r1423 r1433  
    2424        m_ready(false)
    2525    {
    26         vec4 color[2] = { vec4(0.8f,0.2f,0.1f,1.0f),
    27                           vec4(0.1f,0.1f,0.6f,1.0f) };
     26        char const *color[2] = { "sc#c32", "sc#229" };
    2827
    2928        //Red Mesh
    3029        if (type == 0)
    3130        {
    32             m_ship_mesh.SetCurColor(color[type]);
     31            m_ship_mesh.SendCommand(color[type]);
    3332            m_ship_mesh.SendCommand("afcb3,6,7,.4,t0,0,7,sc1,1,1,1,afcb3,4,4,.4,t4,0,-4,mx,fl");
    34             m_ship_mesh.SetCurColor(color[type]);
     33            m_ship_mesh.SendCommand(color[type]);
    3534            m_ship_mesh.SendCommand("afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4,fl");
    3635            m_ship_mesh.SendCommand("scb1,1,1,1,ac4,15,.2,.6,1,1,tz-2,ac4,15,.2,.6,1,1,rx90,t0,-2,-7,fl");
     
    4241        {
    4342            m_ship_mesh.SendCommand("sc1,1,1,1,scb1,1,1,1,ac4,15,.2,.6,1,1,t0,0,-4,ac4,1.5,.2,.6,1,1,rx90,t1.3,-2,-6,afcb3,6,5,.4,t0,0,-7");
    44             m_ship_mesh.SetCurColor(color[type]);
     43            m_ship_mesh.SendCommand(color[type]);
    4544            m_ship_mesh.SendCommand("afcb3,4,7,.4,t4,0,0,mx,fl,afcb3,6,5,.4,sc1,1,1,1,afcb2,3,9,.4");
    4645
     
    4847        }
    4948
    50         m_option_mesh.SetCurColor(color[type]);
     49        m_option_mesh.SendCommand(color[type]);
    5150        m_option_mesh.SendCommand("afcb5,1,3,0.6,fl,sc1,1,1,1,afcb1,5,3,0.6,tz-1,fl");
    5251
  • trunk/orbital/snake.h

    r1423 r1433  
    2020        m_ready(false)
    2121    {
    22         m_head.SendCommand("sc.8,.8,.7,1,afcb10,10,10,1,sc.9,.6,.1,1,afcb30,3,3,.8,fl");
    23         m_head.SendCommand("sc.8,.8,.7,1,afcb.4,.4,12,.4,tz3,tx8,mx,fl");
    24         m_head.SendCommand("sc.8,.8,.7,1,afcb.4,.4,12,.4,tz3,tx12,mx,fl");
    25         m_head.SendCommand("sc.4,.6,.8,.6,afcb5,8,8,1,ty3,tz3,fl");
     22        m_head.SendCommand("sc#d91,"
     23                           "afcb30,3,3,.8,fl,"
     24                           "sc#cca,"
     25                           "afcb10,10,10,1,fl,"
     26                           "afcb.4,.4,12,.4,tz3,tx8,mx,fl,"
     27                           "afcb.4,.4,12,.4,tz3,tx12,mx,fl,"
     28                           "sc#69c9,"
     29                           "afcb5,8,8,1,ty3,tz3,fl");
    2630
    27         m_body.SendCommand("sc.8,.8,.7,1,afcb6,6,12,1,sc.9,.6,.1,1,afcb3,20,3,.8,afcb20,3,3,.8,fl");
    28         m_body.SendCommand("sc.8,.8,.7,1,afcb.4,.4,7,.4,ty8,my,fl");
    29         m_body.SendCommand("sc.8,.8,.7,1,afcb.4,.4,7,.4,tx8,mx,fl");
     31        m_body.SendCommand("sc#d91,"
     32                           "afcb3,20,3,.8,afcb20,3,3,.8,fl,"
     33                           "sc#cca,"
     34                           "afcb6,6,12,1,fl,"
     35                           "afcb.4,.4,7,.4,ty8,my,fl,"
     36                           "afcb.4,.4,7,.4,tx8,mx,fl");
    3037
    31         m_tail.SendCommand("sc.8,.8,.7,1,afcb6,6,10,1,tz-1,fl");
    32         m_tail.SendCommand("sc.9,.6,.1,1,afcb3,15,3,.8,ty8,fl");
    33         m_tail.SendCommand("sc.8,.8,.7,1,afcb.4,.4,8,.4,tz-1,ty8,fl");
    34         m_tail.SendCommand("sc.8,.8,.7,1,afcb.4,.4,8,.4,tz-1,ty12,fl");
    35         m_tail.SendCommand("sc.9,.6,.1,1,afcb15,3,3,.8,tx8,fl");
    36         m_tail.SendCommand("sc.8,.8,.7,1,afcb.4,.4,8,.4,tz-1,tx8,fl");
    37         m_tail.SendCommand("sc.8,.8,.7,1,afcb.4,.4,8,.4,tz-1,tx12,fl");
     38        m_tail.SendCommand("sc#cca,"
     39                           "afcb6,6,10,1,tz-1,fl,"
     40                           "afcb.4,.4,8,.4,tz-1,ty8,fl,"
     41                           "afcb.4,.4,8,.4,tz-1,ty12,fl,"
     42                           "afcb.4,.4,8,.4,tz-1,tx8,fl,"
     43                           "afcb.4,.4,8,.4,tz-1,tx12,fl,"
     44                           "sc#d91,"
     45                           "afcb3,15,3,.8,ty8,fl,"
     46                           "afcb15,3,3,.8,tx8,fl");
    3847
    3948        m_position = vec3(RandF(0.f, 100.f), 20.f, RandF(150.f, 250.f));
  • trunk/orbital/tank.h

    r1423 r1433  
    1919        m_ready(false)
    2020    {
    21         m_body.SendCommand("sc0.1,0.1,0,1,ab6,6,15,ty-2,sc.7,.8,.7,1,afcb4,5,16,0.4,tx4,ty5,mx,fl,sc0.2,0.7,0,1,afcb8,7,10,0.4,tz-4,ty5,fl");
    22         m_turret.SendCommand("sc0.2,0.7,0,1,afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty13,fl,sc.7,.8,.7,1,afcb3,6,10,0.4,rx-30,ty13,fl");
     21        m_body.SendCommand("sc#110,"
     22                           "ab6,6,15,ty-2,"
     23                           "sc#aca,"
     24                           "afcb4,5,16,0.4,tx4,ty5,mx,fl,"
     25                           "sc#3a0,"
     26                           "afcb8,7,10,0.4,tz-4,ty5,fl");
     27        m_turret.SendCommand("sc#3a0,"
     28                             "afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty13,fl,"
     29                             "sc#aca,"
     30                             "afcb3,6,10,0.4,rx-30,ty13,fl");
    2331
    2432        m_rotation = quat::rotate(RandF(0.f, 360.f), vec3(0, 1, 0));
Note: See TracChangeset for help on using the changeset viewer.