From 080a2e410c2bf44402800bd244c900b1f3a10279 Mon Sep 17 00:00:00 2001 From: logsol Date: Wed, 13 Jun 2012 17:27:42 +0200 Subject: [PATCH] restructured repository --- Editor/put-editor-here.txt | 0 index.html | 26 -------- {Editor => tests/editor}/img/sh.png | Bin .../editor}/img/tile_shape_rotation_map.jpg | Bin .../img/tile_shape_rotation_map_view.jpg | Bin {Editor => tests/editor}/index.html | 0 {Editor => tests/editor}/script/Button.js | 0 {Editor => tests/editor}/script/Debug.js | 0 {Editor => tests/editor}/script/Game.js | 0 {Editor => tests/editor}/script/Start.js | 0 {Editor => tests/editor}/script/Tile.js | 0 {Editor => tests/editor}/script/jquery.js | 0 .../editor}/script/jquery.mousewheel.js | 0 {Editor => tests/editor}/script/main.js | 0 {Editor => tests/editor}/style/style.css | 0 {css => tests/game-draft/css}/style.css | 0 tests/game-draft/index.html | 26 ++++++++ .../game-draft/js}/Box2d/Box2dWeb-2.1.a.3.js | 0 .../js}/Box2d/Box2dWeb-2.1.a.3.min.js | 0 .../js}/Chuck/Collision/Detector.js | 0 .../game-draft/js}/Chuck/Config/Setup.js | 0 .../js}/Chuck/Control/InputControlUnit.js | 0 .../game-draft/js}/Chuck/Control/Key.js | 0 .../js}/Chuck/Control/KeyboardInput.js | 0 .../game-draft/js}/Chuck/Loader/Level.js | 0 {lib => tests/game-draft/js}/Chuck/Main.js | 0 .../game-draft/js}/Chuck/Physics/Doll.js | 0 .../game-draft/js}/Chuck/Physics/Engine.js | 0 {lib => tests/game-draft/js}/Chuck/Player.js | 0 .../game-draft/js}/Chuck/Processor.js | 0 tests/game-draft/js/Chuck/View.js | 61 ++++++++++++++++++ .../game-draft/js}/JQuery/jquery.1.7.2.min.js | 0 .../game-draft/js}/Three/Three.min.js | 0 .../game-draft/js}/Three/ThreeDebug.js | 0 {xml => tests/game-draft/xml}/level.xml | 0 tests/three-test/img/green.png | Bin 0 -> 193 bytes {img => tests/three-test/img}/smile.png | Bin three.html => tests/three-test/three.html | 0 38 files changed, 87 insertions(+), 26 deletions(-) delete mode 100644 Editor/put-editor-here.txt delete mode 100755 index.html rename {Editor => tests/editor}/img/sh.png (100%) rename {Editor => tests/editor}/img/tile_shape_rotation_map.jpg (100%) rename {Editor => tests/editor}/img/tile_shape_rotation_map_view.jpg (100%) rename {Editor => tests/editor}/index.html (100%) rename {Editor => tests/editor}/script/Button.js (100%) rename {Editor => tests/editor}/script/Debug.js (100%) rename {Editor => tests/editor}/script/Game.js (100%) rename {Editor => tests/editor}/script/Start.js (100%) rename {Editor => tests/editor}/script/Tile.js (100%) rename {Editor => tests/editor}/script/jquery.js (100%) rename {Editor => tests/editor}/script/jquery.mousewheel.js (100%) rename {Editor => tests/editor}/script/main.js (100%) rename {Editor => tests/editor}/style/style.css (100%) rename {css => tests/game-draft/css}/style.css (100%) create mode 100755 tests/game-draft/index.html rename {lib => tests/game-draft/js}/Box2d/Box2dWeb-2.1.a.3.js (100%) rename {lib => tests/game-draft/js}/Box2d/Box2dWeb-2.1.a.3.min.js (100%) rename {lib => tests/game-draft/js}/Chuck/Collision/Detector.js (100%) rename {lib => tests/game-draft/js}/Chuck/Config/Setup.js (100%) rename {lib => tests/game-draft/js}/Chuck/Control/InputControlUnit.js (100%) rename {lib => tests/game-draft/js}/Chuck/Control/Key.js (100%) rename {lib => tests/game-draft/js}/Chuck/Control/KeyboardInput.js (100%) rename {lib => tests/game-draft/js}/Chuck/Loader/Level.js (100%) rename {lib => tests/game-draft/js}/Chuck/Main.js (100%) rename {lib => tests/game-draft/js}/Chuck/Physics/Doll.js (100%) rename {lib => tests/game-draft/js}/Chuck/Physics/Engine.js (100%) rename {lib => tests/game-draft/js}/Chuck/Player.js (100%) rename {lib => tests/game-draft/js}/Chuck/Processor.js (100%) create mode 100755 tests/game-draft/js/Chuck/View.js rename {lib => tests/game-draft/js}/JQuery/jquery.1.7.2.min.js (100%) rename {lib => tests/game-draft/js}/Three/Three.min.js (100%) rename {lib => tests/game-draft/js}/Three/ThreeDebug.js (100%) rename {xml => tests/game-draft/xml}/level.xml (100%) create mode 100755 tests/three-test/img/green.png rename {img => tests/three-test/img}/smile.png (100%) rename three.html => tests/three-test/three.html (100%) diff --git a/Editor/put-editor-here.txt b/Editor/put-editor-here.txt deleted file mode 100644 index e69de29..0000000 diff --git a/index.html b/index.html deleted file mode 100755 index cff8016..0000000 --- a/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - Box2dWeb Demo - - - - - - - - - - - - - - - - - - -
- -
- - diff --git a/Editor/img/sh.png b/tests/editor/img/sh.png similarity index 100% rename from Editor/img/sh.png rename to tests/editor/img/sh.png diff --git a/Editor/img/tile_shape_rotation_map.jpg b/tests/editor/img/tile_shape_rotation_map.jpg similarity index 100% rename from Editor/img/tile_shape_rotation_map.jpg rename to tests/editor/img/tile_shape_rotation_map.jpg diff --git a/Editor/img/tile_shape_rotation_map_view.jpg b/tests/editor/img/tile_shape_rotation_map_view.jpg similarity index 100% rename from Editor/img/tile_shape_rotation_map_view.jpg rename to tests/editor/img/tile_shape_rotation_map_view.jpg diff --git a/Editor/index.html b/tests/editor/index.html similarity index 100% rename from Editor/index.html rename to tests/editor/index.html diff --git a/Editor/script/Button.js b/tests/editor/script/Button.js similarity index 100% rename from Editor/script/Button.js rename to tests/editor/script/Button.js diff --git a/Editor/script/Debug.js b/tests/editor/script/Debug.js similarity index 100% rename from Editor/script/Debug.js rename to tests/editor/script/Debug.js diff --git a/Editor/script/Game.js b/tests/editor/script/Game.js similarity index 100% rename from Editor/script/Game.js rename to tests/editor/script/Game.js diff --git a/Editor/script/Start.js b/tests/editor/script/Start.js similarity index 100% rename from Editor/script/Start.js rename to tests/editor/script/Start.js diff --git a/Editor/script/Tile.js b/tests/editor/script/Tile.js similarity index 100% rename from Editor/script/Tile.js rename to tests/editor/script/Tile.js diff --git a/Editor/script/jquery.js b/tests/editor/script/jquery.js similarity index 100% rename from Editor/script/jquery.js rename to tests/editor/script/jquery.js diff --git a/Editor/script/jquery.mousewheel.js b/tests/editor/script/jquery.mousewheel.js similarity index 100% rename from Editor/script/jquery.mousewheel.js rename to tests/editor/script/jquery.mousewheel.js diff --git a/Editor/script/main.js b/tests/editor/script/main.js similarity index 100% rename from Editor/script/main.js rename to tests/editor/script/main.js diff --git a/Editor/style/style.css b/tests/editor/style/style.css similarity index 100% rename from Editor/style/style.css rename to tests/editor/style/style.css diff --git a/css/style.css b/tests/game-draft/css/style.css similarity index 100% rename from css/style.css rename to tests/game-draft/css/style.css diff --git a/tests/game-draft/index.html b/tests/game-draft/index.html new file mode 100755 index 0000000..14d9bc8 --- /dev/null +++ b/tests/game-draft/index.html @@ -0,0 +1,26 @@ + + + Box2dWeb Demo + + + + + + + + + + + + + + + + + + +
+ +
+ + diff --git a/lib/Box2d/Box2dWeb-2.1.a.3.js b/tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.js similarity index 100% rename from lib/Box2d/Box2dWeb-2.1.a.3.js rename to tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.js diff --git a/lib/Box2d/Box2dWeb-2.1.a.3.min.js b/tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js similarity index 100% rename from lib/Box2d/Box2dWeb-2.1.a.3.min.js rename to tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js diff --git a/lib/Chuck/Collision/Detector.js b/tests/game-draft/js/Chuck/Collision/Detector.js similarity index 100% rename from lib/Chuck/Collision/Detector.js rename to tests/game-draft/js/Chuck/Collision/Detector.js diff --git a/lib/Chuck/Config/Setup.js b/tests/game-draft/js/Chuck/Config/Setup.js similarity index 100% rename from lib/Chuck/Config/Setup.js rename to tests/game-draft/js/Chuck/Config/Setup.js diff --git a/lib/Chuck/Control/InputControlUnit.js b/tests/game-draft/js/Chuck/Control/InputControlUnit.js similarity index 100% rename from lib/Chuck/Control/InputControlUnit.js rename to tests/game-draft/js/Chuck/Control/InputControlUnit.js diff --git a/lib/Chuck/Control/Key.js b/tests/game-draft/js/Chuck/Control/Key.js similarity index 100% rename from lib/Chuck/Control/Key.js rename to tests/game-draft/js/Chuck/Control/Key.js diff --git a/lib/Chuck/Control/KeyboardInput.js b/tests/game-draft/js/Chuck/Control/KeyboardInput.js similarity index 100% rename from lib/Chuck/Control/KeyboardInput.js rename to tests/game-draft/js/Chuck/Control/KeyboardInput.js diff --git a/lib/Chuck/Loader/Level.js b/tests/game-draft/js/Chuck/Loader/Level.js similarity index 100% rename from lib/Chuck/Loader/Level.js rename to tests/game-draft/js/Chuck/Loader/Level.js diff --git a/lib/Chuck/Main.js b/tests/game-draft/js/Chuck/Main.js similarity index 100% rename from lib/Chuck/Main.js rename to tests/game-draft/js/Chuck/Main.js diff --git a/lib/Chuck/Physics/Doll.js b/tests/game-draft/js/Chuck/Physics/Doll.js similarity index 100% rename from lib/Chuck/Physics/Doll.js rename to tests/game-draft/js/Chuck/Physics/Doll.js diff --git a/lib/Chuck/Physics/Engine.js b/tests/game-draft/js/Chuck/Physics/Engine.js similarity index 100% rename from lib/Chuck/Physics/Engine.js rename to tests/game-draft/js/Chuck/Physics/Engine.js diff --git a/lib/Chuck/Player.js b/tests/game-draft/js/Chuck/Player.js similarity index 100% rename from lib/Chuck/Player.js rename to tests/game-draft/js/Chuck/Player.js diff --git a/lib/Chuck/Processor.js b/tests/game-draft/js/Chuck/Processor.js similarity index 100% rename from lib/Chuck/Processor.js rename to tests/game-draft/js/Chuck/Processor.js diff --git a/tests/game-draft/js/Chuck/View.js b/tests/game-draft/js/Chuck/View.js new file mode 100755 index 0000000..79b76ae --- /dev/null +++ b/tests/game-draft/js/Chuck/View.js @@ -0,0 +1,61 @@ +Chuck.View = function(processor){ + var self = this; + + this._processor = processor; + this._renderer = null; + this._camera; + this._scene; + + this.init(); +} + +Chuck.View.prototype.init = function(){ + if(!Chuck.Settings.DEBUG_DRAW) { + $('#container').removeChild($('#container canvas')); + return; + self._renderer = new THREE.WebGLRenderer(); + self._renderer.setSize(Chuck.Settings.STAGE_WIDTH, Chuck.Settings.STAGE_HEIGHT); + $('#container').append(self._renderer.domElement); + } + + self._scene = new THREE.Scene(); + self._camera = new THREE.PerspectiveCamera(45, Chuck.Settings.STAGE_WIDTH / Chuck.Settings.STAGE_HEIGHT, 1, 1000); + self._camera.position.z = 700; + self._scene.add(self._camera); +} + +Chuck.View.prototype.enterFrame = function(){ + +} + +Chuck.View.prototype.animate = function() { + if(this._renderer){ // if not debug_draw + this._renderer.render(this._scene, this._camera); + } + this._processor.update(); + enterFrame.call(this, this.animate); +} + +Chuck.View.prototype.getScene = function(){ + return this._scene; +} + +Chuck.View.prototype.getCamera = function(){ + return this._camera; +} + +Chuck.View.prototype.getRenderer = function(){ + return this._renderer; +} + +Chuck.View.prototype.createPlane = function(x, y, width, height){ + + var material = new THREE.MeshLambertMaterial({ + map: THREE.ImageUtils.loadTexture("img/green.png") + }); + + var plane = new THREE.Mesh(new THREE.PlaneGeometry(width, height), material); + plane.overdraw = true; + this._scene.add(plane); + return plane; +} \ No newline at end of file diff --git a/lib/JQuery/jquery.1.7.2.min.js b/tests/game-draft/js/JQuery/jquery.1.7.2.min.js similarity index 100% rename from lib/JQuery/jquery.1.7.2.min.js rename to tests/game-draft/js/JQuery/jquery.1.7.2.min.js diff --git a/lib/Three/Three.min.js b/tests/game-draft/js/Three/Three.min.js similarity index 100% rename from lib/Three/Three.min.js rename to tests/game-draft/js/Three/Three.min.js diff --git a/lib/Three/ThreeDebug.js b/tests/game-draft/js/Three/ThreeDebug.js similarity index 100% rename from lib/Three/ThreeDebug.js rename to tests/game-draft/js/Three/ThreeDebug.js diff --git a/xml/level.xml b/tests/game-draft/xml/level.xml similarity index 100% rename from xml/level.xml rename to tests/game-draft/xml/level.xml diff --git a/tests/three-test/img/green.png b/tests/three-test/img/green.png new file mode 100755 index 0000000000000000000000000000000000000000..0eefb37484a2da1119a6a0a09359f33a8631a3b3 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7xu3#}EtuWS#vX|0?b$vps6)SVxKQWd#y>`QOY7GylcsqLT6AjezPmHF18rdNboFyt=akR{0HAt7f&c&j literal 0 HcmV?d00001 diff --git a/img/smile.png b/tests/three-test/img/smile.png similarity index 100% rename from img/smile.png rename to tests/three-test/img/smile.png diff --git a/three.html b/tests/three-test/three.html similarity index 100% rename from three.html rename to tests/three-test/three.html