Changeset 10

Show
Ignore:
Timestamp:
12/07/07 10:27:40 (1 year ago)
Author:
charlie137
Message:

Moved sources into src directory

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/guisterax/Makefile

    r5 r10  
    44all: release 
    55 
    6 release: *.d 
    7     gdc -frelease -o guisterax *.d derelict/util/*.d derelict/sdl/*.d -Iderelict -ldl 
     6release: src/*.d 
     7    gdc -frelease -o guisterax src/*.d src/derelict/util/*.d src/derelict/sdl/*.d -Isrc/ -Isrc/derelict -ldl 
    88     
    9 debug: *.d 
    10     gdc -fdebug -o guisterax *.d derelict/util/*.d derelict/sdl/*.d -Iderelict -ldl 
     9debug: src/*.d 
     10    gdc -fdebug -o guisterax src/*.d src/derelict/util/*.d src/derelict/sdl/*.d -Isrc/ -Isrc/derelict -ldl 
    1111     
    1212clean: 

  • trunk/guisterax/src/actor.d

    r7 r10  
    3131{ 
    3232protected: 
    33     Actor[] m_children; 
     33     
    3434    Actor[] m_next_children; 
    35     bool m_alive = true; 
     35     
    3636public: 
    3737    Actor parent; 
     38    Actor[] children; 
     39    bool alive = true; 
     40     
    3841public: 
    39     Actor[] children() {return m_children;} 
    40      
    4142    T[] children_as(T)() { 
    4243        bool is_t(in Actor a) {return cast(T)a !is null;} 
    …… 
    5354    Universe universe() {return parent_as!(Universe)();} 
    5455     
    55     bool alive() {return m_alive;} 
    56     void kill() {m_alive = false;} 
     56    void kill() {alive = false;} 
    5757     
    5858    this() {} 
    …… 
    7474 
    7575    void iter(float dt = 1) { 
    76         foreach(a; m_children) { 
     76        foreach(a; children) { 
    7777            a.iter(dt); 
    7878        } 
    …… 
    8080     
    8181    void move(float dt = 1) { 
    82         foreach(a; m_children) { 
     82        foreach(a; children) { 
    8383            a.move(dt); 
    8484        } 
    …… 
    8787    void update() { 
    8888        // update actor list 
    89         bool isalive(in Actor a) {return a.alive();} 
    90         m_children = filter!(Actor)(m_next_children, &isalive); 
    91         m_next_children = m_children.dup; 
    92         foreach(a; m_children) { 
     89        bool isalive(in Actor a) {return a.alive;} 
     90        children = filter!(Actor)(m_next_children, &isalive); 
     91        m_next_children = children.dup; 
     92        foreach(a; children) { 
    9393            a.update(); 
    9494        } 
    …… 
    9696     
    9797    void draw(Display disp, in Vect pos = Vect()) { 
    98         foreach(a; m_children) { 
     98        foreach(a; children) { 
    9999            a.draw(disp, pos); 
    100100        } 

  • trunk/guisterax/src/sprite.d

    r7 r10  
    3434{ 
    3535private: 
    36     Vect m_pos = Vect(); 
    3736    Surface[] m_surfs; 
    3837    int m_index; 
    39  
     38public:  
     39    Vect pos = Vect(); 
    4040public: 
    41     // TODO: replace by public attribute 
    42     Vect pos() {return m_pos;} 
    43     void pos(in Vect v) {m_pos = v;}    
    4441        
    4542    void index(uint i) {m_index = i % m_surfs.length;} 
    …… 
    5047    this(Surface[] surfs, in Vect pos = Vect()) { 
    5148        m_surfs = surfs; 
    52         m_pos = pos; 
     49        this.pos = pos; 
    5350    } 
    5451     
    …… 
    5855     
    5956    void draw(Display disp, in Vect pos = Vect()) { 
    60         m_surfs[m_index].draw(disp, pos + m_pos); 
     57        m_surfs[m_index].draw(disp, pos + this.pos); 
    6158    } 
    6259