/minild29

To get this branch, use:
bzr branch http://9ix.org/bzr/minild29

« back to all changes in this revision

Viewing changes to Dark.cpp

  • Committer: Josh C
  • Date: 2011-09-17 03:59:11 UTC
  • Revision ID: josh@9ix.org-20110917035911-wb4a9mw1arfwp2ia
invisible walls and code to bump into them

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dark.cpp
4
4
{
5
5
  Player::Player() : Entity(),
6
6
                     FRICTION(400),
7
 
                     MAXSPEED(20.0f),
 
7
                     MAXSPEED(60.0f),
8
8
                     ACCELERATION(800)
9
9
  {
10
10
    sprite = new SpriteAnimation("player.png", FILTER_NONE, 64, 64);
11
11
    sprite->Add("idle", 0, 0, 0.35f);
12
12
    sprite->Play("idle");
13
13
    SetGraphic(sprite);
14
 
    scale = Vector2(0.25, 0.25);
15
14
 
16
15
    AddTag("player");
17
 
 
18
 
    footsteps = Audio::NewDeck(Assets::RequestAudio("footsteps.ogg"));
19
 
    footsteps->SetLoops(0); //loop indefinitely
20
16
    
21
 
    SetCollider(new RectangleCollider(16, 16));
22
 
 
23
 
    dark = new Entity();
24
 
    dark->SetGraphic(new Sprite("dark.png", FILTER_NONE, 2048, 1536)); //alpha?
 
17
    SetCollider(new RectangleCollider(32, 32));
25
18
  }
26
19
 
27
20
  void Player::Update()
72
65
      }
73
66
    if (ycol) {velocity.y = 0;}
74
67
 
75
 
    if (velocity.GetSquaredMagnitude() > 20)
76
 
      footsteps->Play();
77
 
    else
78
 
      footsteps->Pause(); //Stop()?
79
 
 
80
 
    dark->position = position;
81
68
 
82
69
    //Scene::GetCamera()->position = position;
83
70
  }
84
71
 
85
 
  Creature::Creature() : Entity(),
86
 
                         FRICTION(800),
87
 
                         MAXSPEED(15.0f),
88
 
                         ACCELERATION(1200)                      
89
 
  {
90
 
    sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64);
91
 
    sprite->Add("idle", 0, 0, 0.35f);
92
 
    sprite->Add("move", 1, 2, 4.0f);
93
 
    sprite->Play("idle");
94
 
    SetGraphic(sprite);
95
 
    scale = Vector2(0.25, 0.25);
96
 
 
97
 
    AddTag("creature");
98
 
    SetCollider(new RectangleCollider(16, 16));
99
 
 
100
 
    skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg"));
101
 
    skitter1->SetLoops(0); //loop indefinitely
102
 
 
103
 
    velocity = Vector2::Random() * MAXSPEED;
104
 
 
105
 
    //set aiTime to random so creatures tick at different times
106
 
    aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f;
107
 
  }
108
 
 
109
 
  void Creature::Update()
110
 
  {
111
 
    Entity::Update();
112
 
 
113
 
    aiTime += Monocle::deltaTime;
114
 
    if (aiTime > 1.0f)
115
 
      {
116
 
        switch (rand() % 3)
117
 
          {
118
 
          case 0: // idle
119
 
            //printf("idle\n");
120
 
            direction = Vector2::zero;
121
 
            state = "idle";
122
 
            break;
123
 
          case 1: // move
124
 
            if (state != "wander") {
125
 
              //printf("wander\n");
126
 
              direction = Vector2::Random();
127
 
              state = "wander";
128
 
              break;
129
 
            }
130
 
          }
131
 
        
132
 
        aiTime = 0.0f;
133
 
      }
134
 
    
135
 
    velocity += direction * ACCELERATION * Monocle::deltaTime;
136
 
    
137
 
    velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime);
138
 
    velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime);
139
 
 
140
 
    bool xcol = false;
141
 
    bool ycol = false;
142
 
 
143
 
    position.x += velocity.x * Monocle::deltaTime;
144
 
    while (Collide("Solid"))
145
 
      {
146
 
        xcol = true;
147
 
        if (velocity.x == 0) { break; }
148
 
        //printf("collision1\n");
149
 
        position.x -= SIGN(velocity.x, 0.1);
150
 
      }
151
 
    if (xcol) {velocity.x = 0;}
152
 
 
153
 
    position.y += velocity.y * Monocle::deltaTime;
154
 
    while (Collide("Solid"))
155
 
      {
156
 
        ycol = true;
157
 
        if (velocity.y == 0) { break; }
158
 
        //printf("collision2\n");
159
 
        position.y -= SIGN(velocity.y, 0.1);
160
 
      }
161
 
    if (ycol) {velocity.y = 0;}
162
 
 
163
 
    if (velocity.GetSquaredMagnitude() > 20)
164
 
      {
165
 
        skitter1->Play();
166
 
        sprite->Play("move");
167
 
      }
168
 
    else
169
 
      {
170
 
        skitter1->Pause(); //Stop()?
171
 
        sprite->Play("idle");
172
 
      }
173
 
  }
174
 
 
175
72
  // Scene
176
73
 
177
74
  DarkScene::DarkScene() : Scene()
214
111
        e->SetCollider(new RectangleCollider(s.x * 64, s.y * 64));
215
112
      }
216
113
   
217
 
    player = new Player();
 
114
    Player *player = new Player;
218
115
    player->position = Graphics::GetScreenCenter();
219
116
    Add(player);
220
 
    Add(player->dark);
221
 
 
222
 
    Creature *creature = new Creature;
223
 
    creature->position = Graphics::GetScreenCenter();
224
 
    Add(creature);
225
 
 
226
 
    Creature *creature2 = new Creature;
227
 
    creature2->position = Graphics::GetScreenCenter();
228
 
    Add(creature2);
229
117
 
230
118
    Graphics::SetBackgroundColor(Color::green * 0.2f);
231
119
 
257
145
          {
258
146
            isPaused = !isPaused;
259
147
            
260
 
            if (isPaused) {
261
 
              player->dark->position = Vector2(2048, 1600);
 
148
            if (isPaused)
262
149
              levelEditor->Enable();
263
 
            } else {
 
150
            else
264
151
              levelEditor->Disable();
265
 
            }
266
152
          }
267
153
      }
268
154
 
275
161
      this->font = Assets::RequestFont("LiberationSans-Regular.ttf", 18.0f);
276
162
    else
277
163
      this->font = font;
278
 
 
279
 
    SetLayer(-2);
280
164
  }
281
165
 
282
166
  void Text::Render()