Changeset 127 for branches

Timestamp:

12/10/06 18:52:40 (5 years ago)

Author:

clayasaurus

Message:

sound for ship thrust

Files:

• branches/soundtest/arc/io/sound.d (modified) (1 diff)
• branches/soundtest/classes/ship.d (modified) (11 diffs)
• branches/soundtest/derelict/opengl/glu.d (modified) (1 diff)
• branches/soundtest/run-build.bat (modified) (1 diff)
• branches/soundtest/space/handler.d (modified) (2 diffs)

branches/soundtest/arc/io/sound.d

@@ -125 +125 @@
-
-    float       pitch = 1.0;
-256
+50
-    float       volume = 1.0;
-    float       gain   = 1.0; 

branches/soundtest/classes/ship.d

@@ -64 +64 @@
-    // sound info
-    Sound snd; 
+    public:
+    bool isThrust = false; 
+    bool prevThrust = false; 
+
+    private:
-
-    // AI integers
@@ -465 +470 @@
-        short myAlpha = getAlpha();
-        if( myAlpha < 255 ) setAlpha(myAlpha+1);
+
-        // handle FU_OBJECT stuff
+
-        super.handle_object();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        
-        // handle all of my items
@@ -598 +589 @@
-                                            if( straferMode == 1 ) thrust(ITEM_CLASS.STRAFER, 1);
-                                            else thrust(ITEM_CLASS.STRAFER, -1);
+                                        }
+                                        else{
+                                            isThrust = false; 
-                                        }
-                                    }
@@ -763 +757 @@
-        // handle space storm effects
-        effectShip(this);
+
+        // handle sound code 
+        if (this is PlayerShip)
+        {
+            // set listener to location of playership
+            arc.io.sound.setListenerPosition(getX, getY); 
+        }
+
+        // set sound position to position of ship
+        snd.setPosition(getX, getY);
+
+        if (isThrust == true && prevThrust == false)
+        {
+            snd.play(); 
+            snd.setPitch(.5); 
+        }
+        else if (isThrust == false)
+        {
+            snd.stop(); 
+        }
+
+        snd.process(); 
-    }
-    // return this ship's default action
@@ -841 +857 @@
-        }
-        float d_angle = angDest - getRotation();
-
-
+
+
+
+
+
+
+
+
+
+
-        return angDist;
-    }
@@ -855 +879 @@
-            thrust(ITEM_CLASS.ENGINE, -1);
-            return targetDistance;
+        }else{
+            isThrust = false; 
-        }
-        if( angDistance > 45 ) return targetDistance;
@@ -861 +887 @@
-                if( thrust(ITEM_CLASS.CRUISER, 1) == false ) {
-                    thrust(ITEM_CLASS.ENGINE, 1);
+                }else{
+                    isThrust = false; 
-                }
-                usingCruiser = true;
@@ -875 +903 @@
-                    thrust(ITEM_CLASS.AFTERBURNER, 1);
-                    return targetDistance;
+                }else{
+                    isThrust=false; 
-                }
-            }
-        }
+        // THRUST=FALSE?
-        thrust(ITEM_CLASS.ENGINE, 1);
-        return targetDistance;
@@ -921 +952 @@
-        setFriction(true);
-        int angle_offset = 0;
+
-        bool success = false;
+
-        if( itemClassUsed == ITEM_CLASS.STRAFER ) angle_offset = 90;
-        items.reset();
@@ -934 +967 @@
-                            super.max_speed = items.data.getVars().maximum;
-                            super.accelerate(amount, angle_offset, false, this);
+
-                            if( getAlpha() > 200 && rand()%2==0) {
-                                FU_PARTICLE newParticle;
-                                switch(itemClassUsed) {
-                                case ITEM_CLASS.ENGINE:
+
-                                case ITEM_CLASS.STRAFER:
-                                    newParticle = new FU_PARTICLE(this,255,150,100);
@@ -951 +986 @@
-                            }
-                        }
-
+
+
+
+
-                    }
-                }
-            }
-        }
+
+        isThrust = success; 
+        
-        return success;
-    }
+
-    int getStormProtection() { return stormProtection; }
-    void maxUtils() {

branches/soundtest/derelict/opengl/glu.d

@@ -285 +285 @@
-// TYPES
-//==============================================================================
-;
-;
-;
+{}
+{}
+{}
-
-typedef GLUnurbs GLUnurbsObj;

branches/soundtest/run-build.bat

@@ -1 @@
-
+d -
-PAUSE
-

branches/soundtest/space/handler.d

@@ -40 +40 @@
-    }   
-    if( PlayerShip.getArmor() > 0 ) {
+
+        PlayerShip.prevThrust = PlayerShip.isThrust; 
+
-        if( arc.io.input.keyDown(SDLK_DOWN) ) {
-            PlayerShip.thrust(ITEM_CLASS.ENGINE,-1);
-        } else if( arc.io.input.keyDown(SDLK_UP) ) {
-            PlayerShip.thrust(ITEM_CLASS.ENGINE,1);
-
+
+
+
+
-        if( arc.io.input.keyDown(SDLK_RIGHT) ) {
-            PlayerShip.thrust(ITEM_CLASS.TURNER,1);
@@ -50 +56 @@
-            PlayerShip.thrust(ITEM_CLASS.TURNER,-1);
-        }
+
-        if( arc.io.input.keyDown(SDLK_SPACE) ) {
-            PlayerShip.thrust(ITEM_CLASS.AFTERBURNER,1);