Refactor world controller & renderer

Author: Jarzka

GruntFile.js

@@ -53,6 +53,8 @@ module.exports = function(grunt) {
                     'js/utils/vector2.js',
                     'js/utils/vector3.js',
                     'js/exceptions.js',
+                    'js/texture_container.js',
+                    'js/model_container.js',
                     'js/game/gameplay_object.js',
                     'js/game/vehicle.js',
                     'js/game/road.js',
@@ -64,10 +66,8 @@ module.exports = function(grunt) {
                     'js/game/traffic_light.js',
                     'js/game/traffic_lights_controller.js',
                     'js/game/map.js',
-                    'js/texture_container.js',
-                    'js/model_container.js',
-                    'js/world_renderer.js',
-                    'js/world_controller.js',
+                    'js/game/world_renderer.js',
+                    'js/game/world_controller.js',
                     'js/game/road_controller.js',
                     'js/game/vehicle_controller.js',
                     'js/scenes/gameplay_scene.js',

js/world_controller.js js/game/world_controller.js

@@ -1,5 +1,10 @@
 (function() {
-    TRAFFICSIM_APP.WorldController = function (gameplayScene) {
+    TRAFFICSIM_APP.game = TRAFFICSIM_APP.game || {};
+    TRAFFICSIM_APP.game.world_controller = TRAFFICSIM_APP.game.world_controller || {};
+
+    var NS = TRAFFICSIM_APP.game.world_controller;
+
+    NS.WorldController = function (gameplayScene) {
         var self = this;
 
         var gameplayScene = gameplayScene;

js/world_renderer.js js/game/world_renderer.js

@@ -1,5 +1,12 @@
 (function() {
-    TRAFFICSIM_APP.WorldRenderer = function (worldController) {
+    /* All meshes added to the ThreeJS scene will be automatically drawn on the screen. This namespace
+     * is supposed to handle rendering situations that are part of any other namespace. */
+    TRAFFICSIM_APP.game = TRAFFICSIM_APP.game || {};
+    TRAFFICSIM_APP.game.world_renderer = TRAFFICSIM_APP.game.world_renderer || {};
+
+    var NS = TRAFFICSIM_APP.game.world_renderer;
+
+    NS.WorldRenderer = function (worldController) {
         var renderer;
         var worldController = worldController;
         var drawDebugInfo = {

js/scenes/gameplay_scene.js

@@ -22,8 +22,8 @@
 
         function initialize() {
             clock = new THREE.Clock();
-            worldController = new TRAFFICSIM_APP.WorldController(self);
-            worldRenderer = new TRAFFICSIM_APP.WorldRenderer(worldController);
+            worldController = new TRAFFICSIM_APP.game.world_controller.WorldController(self);
+            worldRenderer = new TRAFFICSIM_APP.game.world_renderer.WorldRenderer(worldController);
         }
 
         this.update = function () {