collisions++, pickup, skybox,

connect · May 1, 2016 · fe212a6 · fe212a6
1 parent cf4d724
commit fe212a6
Show file tree

Hide file tree

Showing 6 changed files with 235 additions and 100 deletions.
diff --git a/config.js b/config.js
@@ -23,12 +23,13 @@ var cfg = {
         83  : '+back',      // s
         39  : '+right',     // right
         68  : '+right',     // d
-        32  : '+jump',      // space
+
 
         187 : 'zoomin',
         189 : 'zoomout',
 
         69  : '+use',        // e
+        32  : '+use',        // space
 
         mouse1 : '+attack'
     }

diff --git a/doom.wad/sound.js b/doom.wad/sound.js
@@ -5,28 +5,15 @@
  * @author kod.connect
  */
 
-/*
-s_.load([
-    
-    // effects
-    'DSPSTOP.ogg',
-    'DSPISTOL.ogg',
-    'DSSWTCHN.ogg',
-    'DSSWTCHX.ogg',
-    
-    // music
-    'D_INTRO.mp3',
-    'D_E1M8.mp3'
-]);
-*/
-
 s_.menuopen     = 'DSSWTCHN.ogg';
 s_.menunext     = 'DSPSTOP.ogg';
 s_.menuback     = 'DSSWTCHX.ogg';
 s_.menuselect   = 'DSPISTOL.ogg';
 
 s_.opendoor     = 'DSDOROPN.ogg';
-
+s_.getweapon    = 'DSSGCOCK.ogg';
+s_.getitem      = 'DSITEMUP.ogg';
+s_.ugh          = 'DSNOWAY.ogg';
 
 s_.play('D_INTRO.mp3');
 s_.positInit();

diff --git a/doom.wad/things.js b/doom.wad/things.js
@@ -61,7 +61,8 @@ o_.things = {
         sprite: 'SPOS',
         sequence: '+',
         class: 'MO',
-        label: 'Former Human Sergeant'
+        label: 'Former Human Sergeant',
+        death: s_.death
     },
     10: {
         radius: 16,

diff --git a/doom.wad/weapons.js b/doom.wad/weapons.js
@@ -29,6 +29,14 @@ o_.wpn.data = {
         cache       : 'ABCDE',
         fire        : 'BCDE',
         flash       : 'A',
+        hitwall     : {
+            sprite  : 'PUFF',
+            sequence: 'ABCD',
+        },        
+        hitflesh    : {
+            sprite  : 'BLUD',
+            sequence: 'ABC'
+        },
         onFire      : {
 
         }

diff --git a/engine/objects.js b/engine/objects.js
@@ -713,7 +713,7 @@ o_.map = new function(){
 
             var o = t.thing[i];
 
-            if (!o.single) continue; // skip multiplayer things
+            if (o.dm) continue; // skip multiplayer things
 
             //floorheight = r_.findFloor( -o.x, o.y );
             //floorheight = (floorheight != false) ? floorheight.object.position.y : 0;
@@ -722,7 +722,7 @@ o_.map = new function(){
             if (o.type == 1) { // setup start spot
 
                 i_.controls.getObject().position.set( -o.x, floorheight + cfg.playerHeight, o.y );
-                //i_.controls.getObject().rotateY( o.angle * Math.PI / -90 );
+                i_.controls.getObject().rotation.set(0, (o.angle + 90) * Math.PI / 180 , 0 );
 
             } else if ( o_.things[ o.type ] != undefined ) {
 
@@ -739,6 +739,53 @@ o_.map = new function(){
             }
         }
 
+        createSkyBox = function(){
+
+            function createMaterial( path, repeat, color ) {
+
+                if (path != undefined) {
+                    var texture = THREE.ImageUtils.loadTexture(path);
+                    var material = new THREE.MeshBasicMaterial( { map: texture, overdraw: 0.5 } );
+
+                    if (repeat != undefined){
+                        material.map.wrapS = material.map.wrapT = THREE.RepeatWrapping;
+                        material.map.repeat.set(repeat, repeat);
+                    }
+                } else if ( color != undefined){
+
+                    var material = new THREE.MeshBasicMaterial({ color: new THREE.Color(color) })
+                }
+
+
+                return material; 
+            }
+
+            // Load the skybox images and create list of materials
+            var materials = [
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // right
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // left
+                createMaterial( undefined, undefined, 'rgb(190,190,190)' ), // top
+                createMaterial( 'doom.wad/gra/F_SKY1.png' ), // bottom
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // back
+                createMaterial( 'doom.wad/gra/SKY1.png' )  // front
+            ];
+
+            // Create a large cube
+            var mesh = new THREE.Mesh( 
+                new THREE.BoxGeometry( 10000, 8000, 10000, 1, 1, 1 ), 
+                new THREE.MeshFaceMaterial( materials ) 
+            );
+
+            mesh.position.copy( i_.controls.getObject().position );
+            mesh.position.y += 2000;
+
+            // Set the x scale to be -1, this will turn the cube inside out
+            mesh.scale.set(-1,1,1);
+            r_.scene.add( mesh );  
+
+            //r_.scene.fog = new THREE.Fog( 0xcccccc, 5000, 7000 );
+        };
+        createSkyBox();
     };    
 
     t.loadWalls = function(){
@@ -939,12 +986,12 @@ o_.map = new function(){
 
             // Load the skybox images and create list of materials
             var materials = [
-                createMaterial( 'doom.wad/gra/SKY4.png' ), // right
-                createMaterial( 'doom.wad/gra/SKY4.png' ), // left
-                createMaterial( 'doom.wad/gra/SKY4.png' ), // top
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // right
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // left
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // top
                 createMaterial( 'doom.wad/gra/F_SKY1.png' ), // bottom
-                createMaterial( 'doom.wad/gra/SKY4.png' ), // back
-                createMaterial( 'doom.wad/gra/SKY4.png' )  // front
+                createMaterial( 'doom.wad/gra/SKY1.png' ), // back
+                createMaterial( 'doom.wad/gra/SKY1.png' )  // front
             ];
 
             // Create a large cube
@@ -972,7 +1019,7 @@ o_.map = new function(){
             r_.scene.add(mesh);
         };
 
-        createSkySphere();
+        //createSkySphere();
 
 
         //scene.fog = new THREE.FogExp2( 0x9999ff, 0.00025 );