diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 0fca203..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "lib/Vendor/Three"] - path = lib/Vendor/Three - url = git://github.com/mrdoob/three.js.git diff --git a/lib/Chuck/View/CameraController.js b/lib/Chuck/View/CameraController.js index 98946fc..28a1826 100755 --- a/lib/Chuck/View/CameraController.js +++ b/lib/Chuck/View/CameraController.js @@ -1,6 +1,7 @@ -define(['Vendor/Wrapper/Three', 'Chuck/Settings'], function(Three, Settings) { +define(['Vendor/Three', 'Chuck/Settings'], function(Three, Settings) { function CameraController() { + /* this.camera = new Three.OrthographicCamera( -Settings.STAGE_WIDTH/2, Settings.STAGE_WIDTH/2, @@ -8,11 +9,13 @@ define(['Vendor/Wrapper/Three', 'Chuck/Settings'], function(Three, Settings) { -Settings.STAGE_HEIGHT/2, -2000, 1000 - ); + );*/ + + this.camera = new Three.OrthographicCamera( 600 / - 2, 600 / 2, 400 / 2, 400 / - 2, - 2000, 1000 ); //this.camera = new Three.PerspectiveCamera(45, 600 / 400, 1, 1000); - this.camera.position.z = 481; + //this.camera.position.z = 481; } CameraController.prototype.getCamera = function(){ diff --git a/lib/Chuck/View/View.js b/lib/Chuck/View/View.js index 2734852..80a53e3 100755 --- a/lib/Chuck/View/View.js +++ b/lib/Chuck/View/View.js @@ -1,4 +1,4 @@ -define(["Vendor/Wrapper/Three", "Chuck/Settings", "Chuck/View/CameraController"], function(Three, Settings, CameraController){ +define(["Vendor/Three", "Chuck/Settings", "Chuck/View/CameraController"], function(Three, Settings, CameraController){ function View(){ @@ -13,14 +13,19 @@ define(["Vendor/Wrapper/Three", "Chuck/Settings", "Chuck/View/CameraController"] var self = this; - this.renderer = new Three.WebGLRenderer(); - this.renderer.setSize(600, 400); + this.renderer = new Three.WebGLRenderer({ + //antialias: true, + preserveDrawingBuffer: true + }); + this.renderer.setClearColorHex(0x333333, 1); + this.renderer.setSize(Settings.STAGE_WIDTH, Settings.STAGE_HEIGHT); + document.body.appendChild(this.renderer.domElement); this.scene = new Three.Scene(); this.scene.add(this.cameraController.getCamera()); -/* + var ambientLight = new Three.AmbientLight(0xffffff); this.scene.add(ambientLight); @@ -30,15 +35,11 @@ define(["Vendor/Wrapper/Three", "Chuck/Settings", "Chuck/View/CameraController"] this.createMesh(100, 100, 100, 100, 'static/img/100.png', function(mesh){ - console.log(mesh); self.scene.add(mesh); + self.animate(self); }); - this.createMesh(100, 100, 210, 100, 'static/img/100.png', function(mesh){ - self.scene.add(mesh); - }); -*/ - this.animate(this); + //this.animate(this); } View.prototype.animate = function(scope) { @@ -55,26 +56,26 @@ define(["Vendor/Wrapper/Three", "Chuck/Settings", "Chuck/View/CameraController"] } View.prototype.render = function() { - console.log('render', this); + this.renderer.render(this.scene, this.cameraController.getCamera()); } - View.prototype.createMesh = function(width, height, x, y, img, callback) { + View.prototype.createMesh = function(width, height, x, y, imgPath, callback) { var textureImg = new Image(); textureImg.onload = function(){ var material = new Three.MeshLambertMaterial({ - map: Three.ImageUtils.loadTexture(img) + map: Three.ImageUtils.loadTexture(imgPath) }); - var plane = new Three.Mesh(new Three.PlaneGeometry(width, height), material); - plane.overdraw = true; - plane.position.z = 0; - plane.position.x = x; - plane.position.y = y; - - callback(plane); + var mesh = new Three.Mesh(new Three.PlaneGeometry(width, height), material); + mesh.overdraw = true;/* + mesh.position.z = 0; + mesh.position.x = x; + mesh.position.y = y; + */ + callback(mesh); }; - textureImg.src = img; + textureImg.src = imgPath; } return View; diff --git a/lib/Vendor/Three.js b/lib/Vendor/Three.js new file mode 100755 index 0000000..779f1ee --- /dev/null +++ b/lib/Vendor/Three.js @@ -0,0 +1,3 @@ +define(["Vendor/Three/build/Three"], function() { + return THREE; +}) \ No newline at end of file