bzr branch
http://9ix.org/bzr/minild29
1
by Josh C
initial commit |
1 |
#include "Dark.h" |
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
2 |
#include <cmath> |
1
by Josh C
initial commit |
3 |
|
4 |
namespace Dark |
|
5 |
{ |
|
6 |
Player::Player() : Entity(), |
|
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
7 |
FRICTION(150), |
8 |
MAXSPEED(150.0f), |
|
9 |
ACCELERATION(300) |
|
1
by Josh C
initial commit |
10 |
{ |
11 |
sprite = new SpriteAnimation("player.png", FILTER_NONE, 64, 64); |
|
12 |
sprite->Add("idle", 0, 0, 0.35f); |
|
13 |
sprite->Play("idle"); |
|
14 |
SetGraphic(sprite); |
|
9
by Josh C
creatures move less, make everything smaller |
15 |
scale = Vector2(0.25, 0.25); |
1
by Josh C
initial commit |
16 |
|
17 |
AddTag("player"); |
|
7
by Josh C
footsteps |
18 |
|
19 |
footsteps = Audio::NewDeck(Assets::RequestAudio("footsteps.ogg")); |
|
20 |
footsteps->SetLoops(0); //loop indefinitely |
|
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
21 |
footsteps->SetVolume(0); |
22 |
footsteps->Play(); |
|
1
by Josh C
initial commit |
23 |
|
9
by Josh C
creatures move less, make everything smaller |
24 |
SetCollider(new RectangleCollider(16, 16)); |
10
by Josh C
"light" in the dark |
25 |
|
26 |
dark = new Entity(); |
|
27 |
dark->SetGraphic(new Sprite("dark.png", FILTER_NONE, 2048, 1536)); //alpha? |
|
1
by Josh C
initial commit |
28 |
} |
29 |
||
30 |
void Player::Update() |
|
31 |
{ |
|
32 |
Entity::Update(); |
|
33 |
||
3
by Josh C
square moving around the screen |
34 |
if (Input::IsKeyMaskHeld("left")) |
35 |
{ |
|
36 |
velocity.x -= ACCELERATION * Monocle::deltaTime; |
|
37 |
} |
|
38 |
if (Input::IsKeyMaskHeld("right")) |
|
39 |
{ |
|
40 |
velocity.x += ACCELERATION * Monocle::deltaTime; |
|
41 |
} |
|
42 |
if (Input::IsKeyMaskHeld("up")) |
|
43 |
{ |
|
44 |
velocity.y -= ACCELERATION * Monocle::deltaTime; |
|
45 |
} |
|
46 |
if (Input::IsKeyMaskHeld("down")) |
|
47 |
{ |
|
48 |
velocity.y += ACCELERATION * Monocle::deltaTime; |
|
49 |
} |
|
50 |
||
51 |
// velocity will approach 0 in steps of FRICTION * dt |
|
52 |
velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime); |
|
53 |
velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime); |
|
54 |
||
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
55 |
if (velocity.GetSquaredMagnitude() > pow(MAXSPEED, 2)) |
56 |
velocity = velocity.GetNormalized() * MAXSPEED; |
|
57 |
||
4
by Josh C
invisible walls and code to bump into them |
58 |
bool xcol = false; |
59 |
bool ycol = false; |
|
60 |
||
61 |
position.x += velocity.x * Monocle::deltaTime; |
|
62 |
while (Collide("Solid")) |
|
63 |
{ |
|
64 |
xcol = true; |
|
65 |
if (velocity.x == 0) { break; } |
|
66 |
//printf("collision1\n"); |
|
67 |
position.x -= SIGN(velocity.x, 0.1); |
|
68 |
} |
|
69 |
if (xcol) {velocity.x = 0;} |
|
70 |
||
71 |
position.y += velocity.y * Monocle::deltaTime; |
|
72 |
while (Collide("Solid")) |
|
73 |
{ |
|
74 |
ycol = true; |
|
75 |
if (velocity.y == 0) { break; } |
|
76 |
//printf("collision2\n"); |
|
77 |
position.y -= SIGN(velocity.y, 0.1); |
|
78 |
} |
|
79 |
if (ycol) {velocity.y = 0;} |
|
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
80 |
|
81 |
float magnitude = velocity.GetMagnitude(); |
|
82 |
||
83 |
footsteps->SetVolume(magnitude / MAXSPEED); |
|
84 |
||
85 |
// How far away can they hear your footsteps? |
|
86 |
// The circle is diameter 300 at MAXSPEED, 32 (2x your size) at 0 speed |
|
87 |
noisiness = ((magnitude / MAXSPEED *(300-32)) + 32) /2; |
|
3
by Josh C
square moving around the screen |
88 |
|
10
by Josh C
"light" in the dark |
89 |
dark->position = position; |
90 |
||
1
by Josh C
initial commit |
91 |
//Scene::GetCamera()->position = position; |
92 |
} |
|
93 |
||
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
94 |
Creature::Creature() : Entity(), |
6
by Josh C
skittering blue square |
95 |
FRICTION(800), |
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
96 |
MAXSPEED(80.0f), |
19
by Josh C
beginnings of "stalk" state |
97 |
ACCELERATION(1200), |
20
by Josh C
some more stalk logic |
98 |
STALKSPEED(5.0f), |
99 |
HUNTSPEED(80.0f) |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
100 |
{ |
101 |
sprite = new SpriteAnimation("creature.png", FILTER_NONE, 64, 64); |
|
102 |
sprite->Add("idle", 0, 0, 0.35f); |
|
8
by Josh C
harder to see creatures |
103 |
sprite->Add("move", 1, 2, 4.0f); |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
104 |
sprite->Play("idle"); |
105 |
SetGraphic(sprite); |
|
9
by Josh C
creatures move less, make everything smaller |
106 |
scale = Vector2(0.25, 0.25); |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
107 |
|
108 |
AddTag("creature"); |
|
9
by Josh C
creatures move less, make everything smaller |
109 |
SetCollider(new RectangleCollider(16, 16)); |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
110 |
|
6
by Josh C
skittering blue square |
111 |
skitter1 = Audio::NewDeck(Assets::RequestAudio("skitter1.ogg")); |
112 |
skitter1->SetLoops(0); //loop indefinitely |
|
17
by Josh C
alert noise |
113 |
alert = Assets::RequestAudio("alert.ogg"); |
19
by Josh C
beginnings of "stalk" state |
114 |
stalk = Assets::RequestAudio("stalk.ogg"); |
17
by Josh C
alert noise |
115 |
|
9
by Josh C
creatures move less, make everything smaller |
116 |
velocity = Vector2::Random() * MAXSPEED; |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
117 |
|
118 |
//set aiTime to random so creatures tick at different times |
|
6
by Josh C
skittering blue square |
119 |
aiTime= (float(rand()) / float(RAND_MAX)) * 1.0f; |
17
by Josh C
alert noise |
120 |
|
121 |
state = "idle"; |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
122 |
} |
123 |
||
124 |
void Creature::Update() |
|
125 |
{ |
|
126 |
Entity::Update(); |
|
127 |
||
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
128 |
if (state == "idle" || state == "wander") |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
129 |
{ |
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
130 |
aiTime += Monocle::deltaTime; |
131 |
if (aiTime > 1.0f) |
|
132 |
{ |
|
133 |
switch (rand() % 3) |
|
134 |
{ |
|
135 |
case 0: // idle |
|
136 |
//printf("idle\n"); |
|
137 |
direction = Vector2::zero; |
|
138 |
state = "idle"; |
|
139 |
break; |
|
140 |
case 1: // move |
|
141 |
if (state != "wander") { |
|
142 |
//printf("wander\n"); |
|
143 |
direction = Vector2::Random(); |
|
144 |
state = "wander"; |
|
145 |
break; |
|
146 |
} |
|
147 |
} |
|
148 |
||
149 |
aiTime = 0.0f; |
|
150 |
} |
|
151 |
||
152 |
Player *player = ((DarkScene *)scene)->player; |
|
153 |
if ( (player->position - position).GetSquaredMagnitude() < |
|
154 |
pow(player->noisiness, 2) ) |
|
155 |
{ |
|
17
by Josh C
alert noise |
156 |
//printf("alert\n"); |
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
157 |
state = "alert"; |
17
by Josh C
alert noise |
158 |
alert->Play(); |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
159 |
direction = Vector2::zero; |
18
by Josh C
ping! |
160 |
Ping::NewPing(position, 8.0f, 32.0f, 0.15f); // ping diameter 16-64 over .5s |
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
161 |
aiTime = 0.0f; // diff variable? stateTime? |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
162 |
} |
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
163 |
} // if idle or wander |
164 |
else if (state == "alert") |
|
165 |
{ |
|
166 |
aiTime += Monocle::deltaTime; |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
167 |
|
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
168 |
// if we've been listening past the grace period and hear |
169 |
// something, switch state again |
|
19
by Josh C
beginnings of "stalk" state |
170 |
// We hear the player at DOUBLE noisiness distance, cuz WE'RE LISNING! |
171 |
Player *player = ((DarkScene *)scene)->player; |
|
172 |
if ( aiTime > 1.0f && |
|
173 |
(player->position - position).GetSquaredMagnitude() < |
|
174 |
pow(player->noisiness * 2, 2) ) |
|
175 |
{ |
|
176 |
state = "stalk"; |
|
177 |
stalk->Play(); |
|
178 |
Ping::NewPing(position, 8.0f, 32.0f, 0.15f); |
|
179 |
direction = (player->position - position).GetNormalized() * STALKSPEED; |
|
180 |
aiTime = 0.0f; |
|
181 |
noiseTime = 0.0f; |
|
182 |
} |
|
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
183 |
|
184 |
// if we've been listening a long time, switch back to idle |
|
17
by Josh C
alert noise |
185 |
if (aiTime > 5.0f) { |
186 |
//printf("end alert\n"); |
|
187 |
state = "idle"; |
|
19
by Josh C
beginnings of "stalk" state |
188 |
aiTime = 0.0f; |
17
by Josh C
alert noise |
189 |
} |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
190 |
} |
19
by Josh C
beginnings of "stalk" state |
191 |
else if (state == "stalk") |
192 |
{ |
|
193 |
aiTime += Monocle::deltaTime; |
|
20
by Josh C
some more stalk logic |
194 |
noiseTime += Monocle::deltaTime; |
195 |
||
196 |
// Go to HUNT if: |
|
197 |
// * it's been >1s & we hear the player |
|
198 |
// * we collide with the player |
|
199 |
Player *player = ((DarkScene *)scene)->player; |
|
200 |
if ((aiTime > 1.0f && |
|
201 |
(player->position - position).GetSquaredMagnitude() < |
|
202 |
pow(player->noisiness, 2) ) |
|
203 |
|| Collide("player") |
|
204 |
) |
|
205 |
{ |
|
206 |
state == "hunt"; |
|
207 |
direction = (player->position - position).GetNormalized() * HUNTSPEED; |
|
208 |
// Play hunt noise (REEET!) |
|
209 |
||
210 |
} |
|
211 |
||
212 |
||
19
by Josh C
beginnings of "stalk" state |
213 |
//after 6 or 7 seconds on the noiseTime clock, play sound and ping again |
214 |
// if we hit a wall, call off the search? |
|
215 |
//we'll want to play that sound again |
|
216 |
// do others go ALERT if we start stalking? |
|
20
by Josh C
some more stalk logic |
217 |
//probably a timeout here too. |
19
by Josh C
beginnings of "stalk" state |
218 |
} |
16
by Josh C
track palyer noisiness, beginnings of "alert" state for creatures |
219 |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
220 |
velocity += direction * ACCELERATION * Monocle::deltaTime; |
221 |
||
222 |
velocity.x = APPROACH(velocity.x, 0, FRICTION * Monocle::deltaTime); |
|
223 |
velocity.y = APPROACH(velocity.y, 0, FRICTION * Monocle::deltaTime); |
|
224 |
||
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
225 |
if (velocity.GetSquaredMagnitude() > pow(MAXSPEED, 2)) |
226 |
velocity = velocity.GetNormalized() * MAXSPEED; |
|
227 |
||
6
by Josh C
skittering blue square |
228 |
bool xcol = false; |
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
229 |
bool ycol = false; |
230 |
||
231 |
position.x += velocity.x * Monocle::deltaTime; |
|
232 |
while (Collide("Solid")) |
|
233 |
{ |
|
234 |
xcol = true; |
|
235 |
if (velocity.x == 0) { break; } |
|
236 |
//printf("collision1\n"); |
|
237 |
position.x -= SIGN(velocity.x, 0.1); |
|
238 |
} |
|
239 |
if (xcol) {velocity.x = 0;} |
|
240 |
||
241 |
position.y += velocity.y * Monocle::deltaTime; |
|
242 |
while (Collide("Solid")) |
|
243 |
{ |
|
244 |
ycol = true; |
|
245 |
if (velocity.y == 0) { break; } |
|
246 |
//printf("collision2\n"); |
|
247 |
position.y -= SIGN(velocity.y, 0.1); |
|
248 |
} |
|
249 |
if (ycol) {velocity.y = 0;} |
|
6
by Josh C
skittering blue square |
250 |
|
7
by Josh C
footsteps |
251 |
if (velocity.GetSquaredMagnitude() > 20) |
8
by Josh C
harder to see creatures |
252 |
{ |
15
by Josh C
make maxspeed work. footstep volume has to do with speed. skitter |
253 |
Vector2 distance = ((DarkScene *)scene)->player->position - position; |
254 |
// at distance 0, vol should be 1.0. at 800, it should be 0. |
|
255 |
float vol = (distance.GetMagnitude() / -800.0f) + 1.0f; |
|
256 |
skitter1->SetVolume(vol); |
|
8
by Josh C
harder to see creatures |
257 |
skitter1->Play(); |
258 |
sprite->Play("move"); |
|
259 |
} |
|
6
by Josh C
skittering blue square |
260 |
else |
8
by Josh C
harder to see creatures |
261 |
{ |
262 |
skitter1->Pause(); //Stop()? |
|
263 |
sprite->Play("idle"); |
|
264 |
} |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
265 |
} |
266 |
||
18
by Josh C
ping! |
267 |
Ping::Ping() : Entity(), |
268 |
d1(0.0f), d2(0.0f), t(0.0f), t2(0.0f) |
|
269 |
{ |
|
270 |
sprite = new Sprite("yellow.png", FILTER_LINEAR, 64, 64); |
|
271 |
SetGraphic(sprite); |
|
272 |
scale = Vector2::zero; |
|
273 |
} |
|
274 |
||
275 |
Ping *Ping::NewPing(Vector2 pos, float d1, float d2, float t2) |
|
276 |
{ |
|
277 |
Ping *ping = new Ping(); |
|
278 |
ping->d1 = d1; |
|
279 |
ping->d2 = d2; |
|
280 |
ping->t2 = t2; |
|
281 |
ping->position = pos; |
|
282 |
||
283 |
Game::GetScene()->Add(ping); |
|
284 |
return ping; |
|
285 |
} |
|
286 |
||
287 |
void Ping::Update() |
|
288 |
{ |
|
289 |
Entity::Update(); |
|
290 |
||
291 |
// once we're done LERPing, get gone |
|
292 |
if (t > t2) |
|
293 |
RemoveSelf(); |
|
294 |
||
295 |
t += Monocle::deltaTime; |
|
296 |
float scaleFactor = LERP(d1/64, d2/64, t/t2); |
|
297 |
scale = Vector2(scaleFactor, scaleFactor); |
|
298 |
} |
|
299 |
||
1
by Josh C
initial commit |
300 |
// Scene |
301 |
||
302 |
DarkScene::DarkScene() : Scene() |
|
303 |
{ |
|
304 |
} |
|
305 |
||
306 |
void DarkScene::Begin() |
|
307 |
{ |
|
308 |
Scene::Begin(); |
|
309 |
||
310 |
Graphics::Set2D(1024, 768); |
|
311 |
||
312 |
Text *inst2 = new Text("Press ESC to quit"); |
|
313 |
inst2->position = Vector2(-492, -354); // 20px h, 30px v from U-L corner |
|
314 |
Add(inst2); |
|
315 |
||
316 |
Input::DefineMaskKey("left", KEY_LEFT); |
|
317 |
Input::DefineMaskKey("right", KEY_RIGHT); |
|
318 |
Input::DefineMaskKey("up", KEY_UP); |
|
319 |
Input::DefineMaskKey("down", KEY_DOWN); |
|
320 |
||
321 |
Input::DefineMaskKey("up", KEY_W); |
|
322 |
Input::DefineMaskKey("left", KEY_A); |
|
323 |
Input::DefineMaskKey("down", KEY_S); |
|
324 |
Input::DefineMaskKey("right", KEY_D); |
|
325 |
||
326 |
// level editor |
|
327 |
Add( levelEditor = new LevelEditor() ); |
|
328 |
levelEditor->Disable(); |
|
329 |
||
330 |
// load level from files |
|
331 |
Level::LoadProject("project.xml"); |
|
332 |
Level::Load("level.xml", this); |
|
4
by Josh C
invisible walls and code to bump into them |
333 |
|
13
by Josh C
visible walls |
334 |
std::list<Entity*> *walls = GetAllTag("wall"); |
335 |
for (std::list<Entity*>::iterator i = walls->begin(); i != walls->end(); ++i) |
|
4
by Josh C
invisible walls and code to bump into them |
336 |
{ |
337 |
Entity *e = (*i); |
|
338 |
Vector2 s = e->scale; |
|
339 |
e->SetCollider(new RectangleCollider(s.x * 64, s.y * 64)); |
|
340 |
} |
|
1
by Josh C
initial commit |
341 |
|
11
by Josh C
disappear darkness mask in editor mode |
342 |
player = new Player(); |
1
by Josh C
initial commit |
343 |
player->position = Graphics::GetScreenCenter(); |
344 |
Add(player); |
|
10
by Josh C
"light" in the dark |
345 |
Add(player->dark); |
1
by Josh C
initial commit |
346 |
|
5
by Josh C
added a "creature" moving around w/ the same dynamics as you do |
347 |
Creature *creature = new Creature; |
348 |
creature->position = Graphics::GetScreenCenter(); |
|
349 |
Add(creature); |
|
350 |
||
7
by Josh C
footsteps |
351 |
Creature *creature2 = new Creature; |
352 |
creature2->position = Graphics::GetScreenCenter(); |
|
353 |
Add(creature2); |
|
354 |
||
10
by Josh C
"light" in the dark |
355 |
Graphics::SetBackgroundColor(Color::green * 0.2f); |
1
by Josh C
initial commit |
356 |
|
357 |
} |
|
358 |
||
359 |
void DarkScene::Update() |
|
360 |
{ |
|
361 |
Scene::Update(); |
|
362 |
||
363 |
if (Input::IsKeyPressed(KEY_ESCAPE)) |
|
364 |
Game::Quit(); |
|
365 |
||
366 |
if (isPaused) |
|
367 |
{ |
|
368 |
if (Input::IsKeyPressed(KEY_S) && Input::IsKeyHeld(KEY_LCTRL)) |
|
369 |
Level::Save(); |
|
370 |
||
371 |
if (Input::IsKeyPressed(KEY_A)) |
|
372 |
Scene::GetCamera()->position.x -= 600; |
|
373 |
||
374 |
if (Input::IsKeyPressed(KEY_D)) |
|
375 |
Scene::GetCamera()->position.x += 600; |
|
376 |
} |
|
377 |
||
378 |
if (Input::IsKeyPressed(KEY_TAB)) |
|
379 |
{ |
|
380 |
// if we're not doing anything in the levelEditor... |
|
381 |
if (levelEditor->GetState() == FTES_NONE) |
|
382 |
{ |
|
383 |
isPaused = !isPaused; |
|
384 |
||
11
by Josh C
disappear darkness mask in editor mode |
385 |
if (isPaused) { |
12
by Josh C
drastically less hacky way to hide the darkness |
386 |
player->dark->isVisible = false; |
1
by Josh C
initial commit |
387 |
levelEditor->Enable(); |
11
by Josh C
disappear darkness mask in editor mode |
388 |
} else { |
1
by Josh C
initial commit |
389 |
levelEditor->Disable(); |
12
by Josh C
drastically less hacky way to hide the darkness |
390 |
player->dark->isVisible = true; |
11
by Josh C
disappear darkness mask in editor mode |
391 |
} |
1
by Josh C
initial commit |
392 |
} |
393 |
} |
|
394 |
||
395 |
}// DarkScene::Update |
|
396 |
||
397 |
Text::Text(const std::string& text, FontAsset* font) |
|
398 |
: Entity(), text(text) |
|
399 |
{ |
|
400 |
if (font == NULL) |
|
401 |
this->font = Assets::RequestFont("LiberationSans-Regular.ttf", 18.0f); |
|
402 |
else |
|
403 |
this->font = font; |
|
11
by Josh C
disappear darkness mask in editor mode |
404 |
|
405 |
SetLayer(-2); |
|
1
by Josh C
initial commit |
406 |
} |
407 |
||
408 |
void Text::Render() |
|
409 |
{ |
|
410 |
Graphics::PushMatrix(); |
|
411 |
||
412 |
// place text directly relative to camera |
|
413 |
Graphics::Translate(scene->GetCamera()->position + position); |
|
414 |
||
415 |
Graphics::SetBlend(BLEND_ALPHA); |
|
416 |
Graphics::SetColor(Color::white); |
|
417 |
Graphics::BindFont(font); |
|
418 |
||
419 |
Graphics::RenderText(*font, text, 0, 0); |
|
420 |
Graphics::PopMatrix(); |
|
421 |
} |
|
422 |
||
423 |
} |