aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOskari Timperi <oskari.timperi@iki.fi>2011-08-05 08:07:37 +0300
committerOskari Timperi <oskari.timperi@iki.fi>2011-08-05 08:07:37 +0300
commitefa951af0f1584da64d0ce8138678292c4394765 (patch)
treeabe860eb16872238487af25c85c214dd2a224320
parent4e29ecb54cc995aeb59a9b57c0c39e5c304286f0 (diff)
downloadcatgag-efa951af0f1584da64d0ce8138678292c4394765.tar.gz
catgag-efa951af0f1584da64d0ce8138678292c4394765.zip
Load resources with ResourceMan
-rw-r--r--catgag.js23
-rw-r--r--index.html2
2 files changed, 24 insertions, 1 deletions
diff --git a/catgag.js b/catgag.js
index 6a88847..513bf17 100644
--- a/catgag.js
+++ b/catgag.js
@@ -35,6 +35,22 @@ Game.handleKeys = function() {
if (stage.isKeyPressed("a")) { this.cat.barrelRoll(); }
}
+Game.resMan = new ResourceMan();
+Game.resMan.root = "gfx/";
+Game.resMan.add("cat", "cat.jpg");
+Game.resMan.add("catgag", "catgag.png");
+Game.resMan.add("vacuum", "vacuum.png");
+Game.resMan.add("vacuum1", "vacuum_1.png");
+Game.resMan.add("vacuum2", "vacuum_2.png");
+Game.resMan.add("vacuum11", "vacuum_11.png");
+Game.resMan.add("vacuum12", "vacuum_12.png");
+Game.resMan.add("vacuum21", "vacuum_21.png");
+Game.resMan.add("vacuum22", "vacuum_22.png");
+Game.resMan.done = function() {
+ window.Log("done");
+ Game.init();
+}
+
window.Game = Game;
}(window));
@@ -48,6 +64,11 @@ window.onload = function() {
window.LogElem = document.getElementById("log");
window.Log("window.onload()");
Ticker.setFPS(30);
- Game.init();
+
+ Game.resMan.loadAll(function() {
+ window.Log(Game.resMan.progress() + "% loaded");
+ });
+
+ //Game.init();
}
diff --git a/index.html b/index.html
index 713f358..f1f677d 100644
--- a/index.html
+++ b/index.html
@@ -23,8 +23,10 @@
<!-- <script src="easel.js"></script> -->
+ <script src="ResourceMan.js"></script>
<script src="Gag.js"></script>
<script src="Cat.js"></script>
+ <script src="VacuumCleaner.js"></script>
<script src="catgag.js"></script>
<style>