Changeset 3100

Timestamp:

2008-01-08 22:39:42 (1 year ago)

Author:

vknecht

Message:

• Vincent changed pcsound.* to not use software-specific interfaces,
  so that they're compatible with OpenAL sound renderer.
  

Location:

cel/trunk

Files:

• docs/history.txt (modified) (1 diff)
• plugins/propclass/sound/soundfact.cpp (modified) (5 diffs)
• plugins/propclass/sound/soundfact.h (modified) (1 diff)

cel/trunk/docs/history.txt

@@ -16 +16 @@
         - caedes added missing comments to some of the functions in linmove 
           interface.
+        - Vincent changed pcsound.* to not use software-specific interfaces,
+          so that they're compatible with OpenAL sound renderer.
 4-Jan-2008
         - caedes added some SWIGIMPORTED guards to swig files, and some

cel/trunk/plugins/propclass/sound/soundfact.cpp

@@ -47 +47 @@
 {
 private:
-  csWeakRef<iSndSysSourceSoftware3D> soundsource;
+  csWeakRef<iSndSysSource3D> soundsource;
 
 public:
-  celSoundSourceMovableListener (iSndSysSourceSoftware3D* soundsource)
+  celSoundSourceMovableListener (iSndSysSource3D* soundsource)
         : scfImplementationType (this), soundsource (soundsource)
   {
@@ -61 +61 @@
       csReversibleTransform tr = movable->GetFullTransform ();
       soundsource->SetPosition (tr.GetOrigin ());
-      soundsource->SetDirection (tr.GetFront ());
+      csRef<iSndSysSource3DDirectionalSimple> ds =
+            scfQueryInterface<iSndSysSource3DDirectionalSimple> (soundsource);
+      ds->SetDirection (tr.GetFront ());
     }
   }
@@ -377 +379 @@
       return true;
     case propid_directionalradiation:
-      if (source3d) source3d->SetDirectionalRadiation (b);
+      if (source3d)
+      {
+        csRef<iSndSysSource3DDirectionalSimple> ds =
+          scfQueryInterface<iSndSysSource3DDirectionalSimple> (source3d);
+        ds->SetDirectionalRadiation (b);
+      }
       return true;
     case propid_minimumdistance:
@@ -400 +407 @@
     case propid_directionalradiation:
       if (source3d)
-        b = source3d->GetDirectionalRadiation ();
+      {
+        csRef<iSndSysSource3DDirectionalSimple> ds =
+          scfQueryInterface<iSndSysSource3DDirectionalSimple> (source3d);
+        b = ds->GetDirectionalRadiation ();
+      }
       else
         b = 0.0f;
@@ -565 +576 @@
   if (src)
   {
-    source = scfQueryInterface<iSndSysSourceSoftware> (src);
-    source3d = scfQueryInterface<iSndSysSourceSoftware3D> (src);
+    source = scfQueryInterface<iSndSysSource> (src);
+    source3d = scfQueryInterface<iSndSysSource3D> (src);
   }
   return source != 0;

cel/trunk/plugins/propclass/sound/soundfact.h

@@ -116 +116 @@
   static PropertyHolder propinfo;
 
-  csRef<iSndSysSourceSoftware3D> source3d;
-  csRef<iSndSysSourceSoftware> source;
+  csRef<iSndSysSource3D> source3d;
+  csRef<iSndSysSource> source;
   csRef<iSndSysStream> stream;
   int mode;