[WIP] Rendering improvements

package.json

@@ -34,37 +34,38 @@
   ],
   "dependencies": {
     "array-find": "^0.1.1",
-    "blizzardry": "^0.3.3",
+    "blizzardry": "^0.4.0",
     "bluebird": "^2.10.0",
     "byte-buffer": "^1.0.3",
     "classnames": "^2.2.0",
     "configstore": "^1.2.0",
     "deep-equal": "^1.0.0",
     "express": "^4.9.3",
     "globby": "^5.0.0",
+    "gsap": "^1.19.0",
     "inquirer": "^0.8.5",
     "jsbn": "timkurvers/jsbn.git#wowser",
     "keymaster": "^1.6.2",
     "morgan": "^1.3.2",
     "normalize.css": "^3.0.3",
     "pngjs": "^2.3.0",
-    "react": "^0.14.3",
-    "react-dom": "^0.14.3",
-    "three": "^0.77.0",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
+    "three": "^0.81.0",
     "websockify": "^0.7.1"
   },
   "devDependencies": {
-    "babel-core": "^6.9.1",
-    "babel-eslint": "^6.0.4",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-transform-class-properties": "^6.9.1",
+    "babel-core": "^6.17.0",
+    "babel-eslint": "^6.1.0",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-transform-class-properties": "^6.9.0",
     "babel-plugin-transform-export-extensions": "^6.8.0",
     "babel-plugin-transform-function-bind": "^6.8.0",
-    "babel-plugin-transform-es2015-block-scoping": "^6.10.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.8.0",
+    "babel-plugin-transform-es2015-block-scoping": "^6.15.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.16.0",
     "babel-plugin-transform-es2015-parameters": "^6.9.0",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-react": "^6.5.0",
+    "babel-preset-react": "^6.11.0",
     "chai": "^3.5.0",
     "codeclimate-test-reporter": "^0.1.0",
     "css-loader": "^0.23.0",
@@ -84,7 +85,7 @@
     "gulp-plumber": "^1.1.0",
     "gulp-remember": "^0.3.0",
     "gulp-stylus": "^2.4.0",
-    "html-webpack-plugin": "^2.20.0",
+    "html-webpack-plugin": "^2.21.0",
     "istanbul": "^0.4.0",
     "json-loader": "^0.5.4",
     "mocha": "^2.5.0",
@@ -95,8 +96,8 @@
     "style-loader": "^0.13.0",
     "stylus-loader": "^1.6.1",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.1",
-    "webpack-dev-server": "^1.14.1",
+    "webpack": "^1.13.0",
+    "webpack-dev-server": "^1.14.0",
     "worker-loader": "^0.7.0"
   }
 }

src/lib/game/world/doodad-manager.js

@@ -11,8 +11,10 @@ class DoodadManager {
   // Number of milliseconds to wait before loading another portion of doodads.
   static LOAD_INTERVAL = 1;
 
-  constructor(map) {
-    this.map = map;
+  constructor(view, zeropoint) {
+    this.view = view;
+    this.zeropoint = zeropoint;
+
     this.chunkRefs = new Map();
 
     this.doodads = new Map();
@@ -177,16 +179,16 @@ class DoodadManager {
     const doodad = this.doodads.get(entry.id);
     this.doodads.delete(entry.id);
     this.animatedDoodads.delete(entry.id);
-    this.map.remove(doodad);
+    this.container.remove(doodad);
 
     M2Blueprint.unload(doodad);
   }
 
   // Place a doodad on the world map, adhereing to a provided position, rotation, and scale.
   placeDoodad(doodad, position, rotation, scale) {
     doodad.position.set(
-      -(position.z - this.map.constructor.ZEROPOINT),
-      -(position.x - this.map.constructor.ZEROPOINT),
+      -(position.z - this.zeropoint),
+      -(position.x - this.zeropoint),
       position.y
     );
 
@@ -207,11 +209,16 @@ class DoodadManager {
     }
 
     // Add doodad to world map.
-    this.map.add(doodad);
+    this.view.add(doodad);
     doodad.updateMatrix();
+    doodad.updateMatrixWorld();
   }
 
   animate(delta, camera, cameraMoved) {
+    if (!this.view.visible) {
+      return;
+    }
+
     this.animatedDoodads.forEach((doodad) => {
       if (!doodad.visible) {
         return;

src/lib/game/world/handler.js

@@ -126,6 +126,10 @@ class WorldHandler extends EventEmitter {
     this.animateEntities(delta, camera, cameraMoved);
 
     if (this.map !== null) {
+      if (cameraMoved) {
+        this.map.locateCamera(camera);
+      }
+
       this.map.animate(delta, camera, cameraMoved);
     }
 

src/lib/game/world/light/default.js

@@ -0,0 +1,13 @@
+const fogStart = 20.0;
+const fogEnd = 200.0;
+const fogRange = fogEnd - fogStart;
+
+const values = {
+  sunParams:          [-0.8,   -0.8, -0.8, 0.0],
+  sunAmbientColor:    [ 0.5,    0.5,  0.5, 0.0],
+  sunDiffuseColor:    [ 0.25,   0.5,  1.0, 0.0],
+  fogParams:          [ -(1.0 / (fogRange)), (1.0 / fogRange) * fogEnd, 1.0, 0.0],
+  fogColor:           [ 0.25,   0.5,  1.0, 0.0]
+};
+
+export default values;