changed function( to function (

This commit is contained in:
logsol 2012-07-28 13:38:31 +02:00
parent 26f3d22db7
commit 7e5eeb0a27
36 changed files with 209 additions and 209 deletions

View file

@ -1,4 +1,4 @@
define(['Lib/Vendor/Three', 'Game/Config/Settings'], function(Three, Settings) {
define(['Lib/Vendor/Three', 'Game/Config/Settings'], function (Three, Settings) {
function CameraController(isOrthographic) {
@ -31,17 +31,17 @@ define(['Lib/Vendor/Three', 'Game/Config/Settings'], function(Three, Settings) {
this.camera.position.z = 481;
}
CameraController.prototype.getCamera = function(){
CameraController.prototype.getCamera = function (){
return this.camera;
}
CameraController.prototype.setPosition = function(x, y){
CameraController.prototype.setPosition = function (x, y){
this.camera.position.x = x;
this.camera.position.y = y;
}
CameraController.prototype.setZoom = function(z){
CameraController.prototype.setZoom = function (z){
this.camera.position.z = z;
}

View file

@ -1,11 +1,11 @@
define(['Game/Config/Settings'], function(Settings) {
define(['Game/Config/Settings'], function (Settings) {
var DomController = {
canvas: null,
debugCanvas: null
};
DomController.getCanvasContainer = function(){
DomController.getCanvasContainer = function (){
var container = document.getElementById(Settings.CANVAS_DOM_ID);
if(container) {
@ -15,11 +15,11 @@ define(['Game/Config/Settings'], function(Settings) {
}
}
DomController.getCanvas = function(){
DomController.getCanvas = function (){
return DomController.canvas;
}
DomController.setCanvas = function(canvas){
DomController.setCanvas = function (canvas){
var container = DomController.getCanvasContainer();
if(DomController.canvas){
@ -30,11 +30,11 @@ define(['Game/Config/Settings'], function(Settings) {
container.appendChild(canvas);
}
DomController.getDebugCanvas = function(){
DomController.getDebugCanvas = function (){
return DomController.debugCanvas;
}
DomController.createDebugCanvas = function(){
DomController.createDebugCanvas = function (){
var container = DomController.getCanvasContainer();
if(DomController.debugCanvas){

View file

@ -5,7 +5,7 @@ var requires = [
"Game/Client/View/CameraController"
];
define(requires, function(DomController, Three, Settings, CameraController){
define(requires, function (DomController, Three, Settings, CameraController){
function ViewController(){
@ -25,7 +25,7 @@ define(requires, function(DomController, Three, Settings, CameraController){
}
}
ViewController.prototype.init = function(){
ViewController.prototype.init = function (){
var self = this;
@ -61,12 +61,12 @@ define(requires, function(DomController, Three, Settings, CameraController){
this.scene.add(directionalLight);
this.createMesh(100, 100, 100, 100, 'static/img/100.png', function(mesh){
this.createMesh(100, 100, 100, 100, 'static/img/100.png', function (mesh){
self.mesh = mesh;
self.scene.add(mesh);
});
/*
this.createMesh(50, 50, 200, 100, 'static/img/100.png', function(mesh){
this.createMesh(50, 50, 200, 100, 'static/img/100.png', function (mesh){
self.scene.add(mesh);
});
*/
@ -74,7 +74,7 @@ define(requires, function(DomController, Three, Settings, CameraController){
//this.animate(this);
}
ViewController.prototype.update = function() {
ViewController.prototype.update = function () {
if(this.mesh) {
this.mesh.rotation.z += .01;
@ -86,14 +86,14 @@ define(requires, function(DomController, Three, Settings, CameraController){
this.render();
}
ViewController.prototype.render = function() {
ViewController.prototype.render = function () {
this.renderer.render(this.scene, this.cameraController.getCamera());
}
ViewController.prototype.createMesh = function(width, height, x, y, imgPath, callback) {
ViewController.prototype.createMesh = function (width, height, x, y, imgPath, callback) {
var textureImg = new Image();
textureImg.onload = function(){
textureImg.onload = function (){
var material = new Three.MeshLambertMaterial({
map: Three.ImageUtils.loadTexture(imgPath)
});