Changeset 153

Timestamp:

06/11/06 22:23:42 (2 years ago)

Author:

aldacron

Message:

[DerelictAL]
* added missing alc* functions
* added some missing aliases to alctypes.d
* changed calling convention of all functions to extern(C) on windows
[Docs]
* updated al.html and gl.html to reflect function declaration differences between C versions and Derelict (ubyte* -> char*)
* added to loading.html the description of and rationale behind the optional string parameter for the load function

Files:

• trunk/DerelictAL/derelict/openal/alctypes.d (modified) (1 diff)
• trunk/DerelictAL/derelict/openal/almanual.d (modified) (4 diffs)
• trunk/docs/al.html (modified) (1 diff)
• trunk/docs/gl.html (modified) (1 diff)
• trunk/docs/loading.html (modified) (1 diff)

trunk/DerelictAL/derelict/openal/alctypes.d

@@ -54 +54 @@
-alias void ALCvoid;
-
+alias ALCvoid ALCdevice;
+alias ALCvoid ALCcontext;
+
-const ALCenum ALC_INVALID           = 0;
-const ALCboolean ALC_FALSE          = 0;

trunk/DerelictAL/derelict/openal/almanual.d

@@ -41 +41 @@
-    {
-        import derelict.openal.altypes;
+        import derelict.openal.alctypes;
-        import derelict.util.loader;
-    }
@@ -108 +109 @@
-        bindFunc(alDopplerVelocity)("alDopplerVelocity", lib);
-        bindFunc(alDistanceModel)("alDistanceModel", lib);
+
+        bindFunc(alcGetString)("alcGetString", lib);
+        bindFunc(alcGetIntegerv)("alcGetIntegerv", lib);
+        bindFunc(alcOpenDevice)("alcOpenDevice", lib);
+        bindFunc(alcCloseDevice)("alcCloseDevice", lib);
+        bindFunc(alcCreateContext)("alcCreateContext", lib);
+        bindFunc(alcMakeContextCurrent)("alcMakeContextCurrent", lib);
+        bindFunc(alcProcessContext)("alcProcessConext", lib);
+        bindFunc(alcGetCurrentContext)("alcGetCurrentContext", lib);
+        bindFunc(alcGetContextsDevice)("alcGetContextsDevice", lib);
+        bindFunc(alcSuspendContext)("alcSuspendContext", lib);
+        bindFunc(alcDestroyContext)("alcDestroyContext", lib);
+        bindFunc(alcGetError)("alcGetError", lib);
+        bindFunc(alcIsExtensionPresent)("alcIsExtensionPresent", lib);
+        bindFunc(alcGetProcAddress)("alcGetProcAddress", lib);
+        bindFunc(alcGetEnumValue)("alcGetEnumValue", lib);
-    }
-
-   alias   GenericLoader!("OpenAL32.dll", "libal.so, libAL.so, libopenal.so, libopenal.so.0", "", loadAL)  
+    alias   GenericLoader!("OpenAL32.dll", "libal.so, libAL.so, libopenal.so, libopenal.so.0", "", loadAL)  
-
-
@@ -131 +148 @@
-
-
-   alias   
-
-
-
+    alias   
+
+
+/*
-        extern(Windows):
-    else
-  
+*/
-
-    typedef void function(ALenum) pfalEnable;
@@ -269 +286 @@
-    }
-
+    // ALC
+    typedef char* function(ALCdevice*, ALCenum) pfalcGetString;
+    typedef ALCvoid function(ALCdevice*, ALCenum, ALCsizei, ALCint*) pfalcGetIntegerv;
+    pfalcGetString                          alcGetString;
+    pfalcGetIntegerv                        alcGetIntegerv;
+
+    typedef ALCdevice* function(char*) pfalcOpenDevice;
+    typedef ALCvoid function(ALCdevice*) pfalcCloseDevice;
+    pfalcOpenDevice                         alcOpenDevice;
+    pfalcCloseDevice                        alcCloseDevice;
+
+    typedef ALCcontext* function(ALCdevice*, ALCint*) pfalcCreateContext;
+    typedef ALCboolean function(ALCcontext*) pfalcMakeContextCurrent;
+    typedef ALCvoid function(ALCcontext*) pfalcProcessContext;
+    typedef ALCcontext* function() pfalcGetCurrentContext;
+    typedef ALCdevice* function(ALCcontext*) pfalcGetContextsDevice;
+    typedef ALCvoid function(ALCcontext*) pfalcSuspendContext;
+    typedef ALCvoid function(ALCcontext*) pfalcDestroyContext;
+    pfalcCreateContext                      alcCreateContext;
+    pfalcMakeContextCurrent                 alcMakeContextCurrent;
+    pfalcProcessContext                     alcProcessContext;
+    pfalcGetCurrentContext                  alcGetCurrentContext;
+    pfalcGetContextsDevice                  alcGetContextsDevice;
+    pfalcSuspendContext                     alcSuspendContext;
+    pfalcDestroyContext                     alcDestroyContext;
+
+    typedef ALCenum function(ALCdevice*) pfalcGetError;
+    pfalcGetError                           alcGetError;
+
+    typedef ALCboolean function(ALCdevice*, char*) pfalcIsExtensionPresent;
+    typedef ALCvoid* function(ALCdevice*, char*) pfalcGetProcAddress;
+    typedef ALCenum function(ALCdevice*, char*) pfalcGetEnumValue;
+    pfalcIsExtensionPresent                 alcIsExtensionPresent;
+    pfalcGetProcAddress                 alcGetProcAddress;
+    pfalcGetEnumValue                       alcGetEnumValue;
+
-    // ALU
-    version(Windows)
-    {
-
+
+
+
-            typedef ALint function(ALfloat) pfaluF2L;
-            typedef ALshort function(ALfloat) pfaluF2S;

trunk/docs/al.html

@@ -59 +59 @@
-</p>
-
+<div class="note">Return values and function parameters of type 
+<tt>ALubyte*</tt> or <tt>ALCubyte*</tt>, when intended to represent a string,
+have been declared in DerelictAL as <tt>char*</tt> instead.</div>
+
-<p><pre>
-import derelict.openal.al;

trunk/docs/gl.html

@@ -44 +44 @@
-</pre>
-
+<div class="note">Return values and parameters of type <tt>GLubyte*</tt>, when
+instended to represent a string, have been declared in DerelictGL as <tt>char*</tt> 
+instead.</div>
-
-<p>

trunk/docs/loading.html

@@ -56 +56 @@
-Simple, eh? 
-</p><p>
+The load method accepts an optional shared library name string parameter that will
+overload the default search mechanism. For example, on Windows DerelictAL attempts
+to load "openal32.dll" by default. Some systems have audio drivers that provide
+a hardware accelerated version of OpenAL, some do not. You may want to ship the
+OpenAL dll with your app, but renamed to something like "myopenal.dll", or perhaps
+with the same name but in a subdirectory of the application directory ("al/openal32.dll"). 
+If the <tt>DerelictAL.load()</tt> fails, then you can call 
+<tt>DerelictAL.load("myopenal.dll")</tt> instead. This is important because
+Windows (and other OSes) will look in the application's directory for a given
+shared library before looking in system directories. If you were to drop openal32.dll
+in your application's directory, it would be loaded every time. This technique
+can be used for every Derelict package, not just DerelictAL.
+</p><p>
-Sometimes, loads fail. There are several root causes for this, the end result
-being either that the system couldn't find the shared library or one of the