/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-18 02:03:11 UTC
  • Revision ID: josh@9ix.org-20110918020311-pfahqi05rhcnhz20
make maxspeed work.  footstep volume has to do with speed.  skitter 
volume has to do with distance from you.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dark.cpp
1
1
#include "Dark.h"
 
2
#include <cmath>
2
3
 
3
4
namespace Dark
4
5
{
5
6
  Player::Player() : Entity(),
6
 
                     FRICTION(400),
7
 
                     MAXSPEED(60.0f),
8
 
                     ACCELERATION(800)
 
7
                     FRICTION(150),
 
8
                     MAXSPEED(150.0f),
 
9
                     ACCELERATION(300)
9
10
  {
10
11
    sprite = new SpriteAnimation("player.png", FILTER_NONE, 64, 64);
11
12
    sprite->Add("idle", 0, 0, 0.35f);
12
13
    sprite->Play("idle");
13
14
    SetGraphic(sprite);
 
15
    scale = Vector2(0.25, 0.25);
14
16
 
15
17
    AddTag("player");
16
18
 
17
19
    footsteps = Audio::NewDeck(Assets::RequestAudio("footsteps.ogg"));
18
20
    footsteps->SetLoops(0); //loop indefinitely
 
21
    footsteps->SetVolume(0);
 
22
    footsteps->Play();
19
23
    
20
 
    SetCollider(new RectangleCollider(32, 32));
 
24
    SetCollider(new RectangleCollider(16, 16));
 
25
 
 
26
    dark = new Entity();
 
27
    dark->SetGraphic(new Sprite("dark.png", FILTER_NONE, 2048, 1536)); //alpha?
21
28
  }
22
29
 
23
30
  void Player::Update()
45
52
    velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime);
46
53
    velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime);
47
54
 
 
55
    if (velocity.GetSquaredMagnitude() > pow(MAXSPEED, 2))
 
56
      velocity = velocity.GetNormalized() * MAXSPEED;
 
57
 
48
58
    bool xcol = false;
49
59
    bool ycol = false;
50
60
 
68
78
      }
69
79
    if (ycol) {velocity.y = 0;}
70
80
 
71
 
    if (velocity.GetSquaredMagnitude() > 20)
72
 
      footsteps->Play();
73
 
    else
74
 
      footsteps->Pause(); //Stop()?
 
81
    float vol = velocity.GetMagnitude() / MAXSPEED;
 
82
    footsteps->SetVolume(vol);
 
83
 
 
84
    dark->position = position;
75
85
 
76
86
    //Scene::GetCamera()->position = position;
77
87
  }
78
88
 
79
89
  Creature::Creature() : Entity(),
80
90
                         FRICTION(800),
81
 
                         MAXSPEED(30.0f),
 
91
                         MAXSPEED(80.0f),
82
92
                         ACCELERATION(1200)                      
83
93
  {
84
94
    sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64);
85
95
    sprite->Add("idle", 0, 0, 0.35f);
 
96
    sprite->Add("move", 1, 2, 4.0f);
86
97
    sprite->Play("idle");
87
98
    SetGraphic(sprite);
 
99
    scale = Vector2(0.25, 0.25);
88
100
 
89
101
    AddTag("creature");
90
 
    SetCollider(new RectangleCollider(32, 32));
 
102
    SetCollider(new RectangleCollider(16, 16));
91
103
 
92
104
    skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg"));
93
105
    skitter1->SetLoops(0); //loop indefinitely
94
106
 
95
 
    velocity = Vector2::Random() * ACCELERATION;
 
107
    velocity = Vector2::Random() * MAXSPEED;
96
108
 
97
109
    //set aiTime to random so creatures tick at different times
98
110
    aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f;
105
117
    aiTime += Monocle::deltaTime;
106
118
    if (aiTime > 1.0f)
107
119
      {
108
 
        switch (rand() % 2)
 
120
        switch (rand() % 3)
109
121
          {
110
122
          case 0: // idle
111
123
            //printf("idle\n");
129
141
    velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime);
130
142
    velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime);
131
143
 
 
144
    if (velocity.GetSquaredMagnitude() > pow(MAXSPEED, 2))
 
145
      velocity = velocity.GetNormalized() * MAXSPEED;
 
146
 
132
147
    bool xcol = false;
133
148
    bool ycol = false;
134
149
 
153
168
    if (ycol) {velocity.y = 0;}
154
169
 
155
170
    if (velocity.GetSquaredMagnitude() > 20)
156
 
      skitter1->Play();
 
171
      {
 
172
        Vector2 distance = ((DarkScene *)scene)->player->position - position;
 
173
        // at distance 0, vol should be 1.0.  at 800, it should be 0.
 
174
        float vol = (distance.GetMagnitude() / -800.0f) + 1.0f;
 
175
        skitter1->SetVolume(vol);
 
176
        skitter1->Play();
 
177
        sprite->Play("move");
 
178
      }
157
179
    else
158
 
      skitter1->Pause(); //Stop()?
 
180
      {
 
181
        skitter1->Pause(); //Stop()?
 
182
        sprite->Play("idle");
 
183
      }
159
184
  }
160
185
 
161
186
  // Scene
192
217
    Level::LoadProject("project.xml");
193
218
    Level::Load("level.xml", this);
194
219
 
195
 
    std::list<Entity*> *inv = GetAllTag("invisible");
196
 
    for (std::list<Entity*>::iterator i = inv->begin(); i != inv->end(); ++i)
 
220
    std::list<Entity*> *walls = GetAllTag("wall");
 
221
    for (std::list<Entity*>::iterator i = walls->begin(); i != walls->end(); ++i)
197
222
      {
198
223
        Entity *e = (*i);
199
224
        Vector2 s = e->scale;
200
225
        e->SetCollider(new RectangleCollider(s.x * 64, s.y * 64));
201
226
      }
202
227
   
203
 
    Player *player = new Player;
 
228
    player = new Player();
204
229
    player->position = Graphics::GetScreenCenter();
205
230
    Add(player);
 
231
    Add(player->dark);
206
232
 
207
233
    Creature *creature = new Creature;
208
234
    creature->position = Graphics::GetScreenCenter();
242
268
          {
243
269
            isPaused = !isPaused;
244
270
            
245
 
            if (isPaused)
 
271
            if (isPaused) {
 
272
              player->dark->isVisible = false;
246
273
              levelEditor->Enable();
247
 
            else
 
274
            } else {
248
275
              levelEditor->Disable();
 
276
              player->dark->isVisible = true;
 
277
            }
249
278
          }
250
279
      }
251
280
 
258
287
      this->font = Assets::RequestFont("LiberationSans-Regular.ttf", 18.0f);
259
288
    else
260
289
      this->font = font;
 
290
 
 
291
    SetLayer(-2);
261
292
  }
262
293
 
263
294
  void Text::Render()