Changeset 90
- Timestamp:
- 02/20/05 01:08:56 (4 years ago)
- Files:
-
- trunk/DerelictAL/derelict/openal/al.d (modified) (2 diffs)
- trunk/DerelictGL/derelict/opengl/gl.d (modified) (2 diffs)
- trunk/DerelictGL/derelict/opengl/internal.d (modified) (2 diffs)
- trunk/DerelictGLFW/derelict/glfw/glfw.d (modified) (1 diff)
- trunk/DerelictGLU/derelict/opengl/glu.d (modified) (1 diff)
- trunk/DerelictSDL/derelict/sdl/sdl.d (modified) (1 diff)
- trunk/DerelictSDLImage/derelict/sdl/image.d (modified) (1 diff)
- trunk/DerelictSDLMixer/derelict/sdl/mixer.d (modified) (1 diff)
- trunk/DerelictSDLNet/derelict/sdl/net.d (modified) (11 diffs)
- trunk/DerelictSDLttf/derelict/sdl/ttf.d (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/DerelictAL/derelict/openal/al.d
r80 r90 247 247 } 248 248 249 public void DerelictAL_Unload() 250 { 251 if(hal !== null) 252 ExeModule_Release(hal); 253 if(exeModuleInited) 254 { 255 ExeModule_Uinit(); 256 exeModuleInited = false; 257 } 258 } 259 249 260 version(Windows) 250 261 { … … 266 277 static ~this() 267 278 { 268 if(exeModuleInited) 269 { 270 ExeModule_Release(hal); 271 ExeModule_Uninit(); 272 } 273 } 279 DerelictAL_Unload(); 280 } trunk/DerelictGL/derelict/opengl/gl.d
r84 r90 43 43 public void DerelictGL_Load(char[] libName) 44 44 { 45 45 internalLoad(libName); 46 46 loadPlatformGL(); 47 47 loadGL(); … … 56 56 } 57 57 58 public void DerelictGL_Unload() 59 { 60 internalCleanup(); 61 } 62 58 63 59 64 static ~this() 60 65 { 61 internalCleanup();66 DerelictGL_Unload(); 62 67 } trunk/DerelictGL/derelict/opengl/internal.d
r83 r90 16 16 package void internalLoad(char[] libName) 17 17 { 18 18 if(hlib !== null) 19 19 return; 20 20 … … 28 28 if(hlib is null) 29 29 throw new Exception("Failed to load the shared library " ~ libName); 30 30 31 31 } 32 32 33 33 package void internalCleanup() 34 34 { 35 ExeModule_Release(hlib); 35 if(hlib !== null) 36 ExeModule_Release(hlib); 36 37 if(exeModuleInited) 38 { 37 39 ExeModule_Uninit(); 40 exeModuleInited = false; 41 } 38 42 } trunk/DerelictGLFW/derelict/glfw/glfw.d
r89 r90 85 85 } 86 86 87 static ~this() 88 { 87 public void DerelictGLFW_Unload() 88 { 89 if(hglfw) 90 ExeModule_Release(hglfw); 89 91 if(exeModuleInited) 90 92 { 91 ExeModule_Release(hglfw);92 93 ExeModule_Uninit(); 94 exeModuleInited = false; 93 95 } 94 96 } 95 97 96 version(Windows) 97 extern(Windows): 98 static ~this() 99 { 100 DerelictGLFW_Unload(); 101 } 102 103 version(Windows) 104 extern(Windows): 98 105 else 99 106 extern(C): 100 107 101 108 //----------------------------------------------------------- trunk/DerelictGLU/derelict/opengl/glu.d
r84 r90 130 130 } 131 131 132 public void DerelictGLU_Unload() 133 { 134 if(hglu !== null) 135 ExeModule_Release(hglu); 136 } 137 132 138 133 139 static ~this() 134 140 { 135 ExeModule_Release(hglu);141 DerelictGLU_Unload(); 136 142 } 137 143 trunk/DerelictSDL/derelict/sdl/sdl.d
r80 r90 331 331 } 332 332 333 public void DerelictSDL_Unload() 334 { 335 if(hsdl !== null) 336 ExeModule_Release(hsdl); 337 if(exeModuleInited) 338 { 339 ExeModule_Uninit(); 340 exeModuleInited = false; 341 } 342 } 343 333 344 static ~this() 334 345 { 335 if(exeModuleInited) 336 { 337 ExeModule_Release(hsdl); 338 ExeModule_Uninit(); 339 } 340 } 346 DerelictSDL_Unload(); 347 } trunk/DerelictSDLImage/derelict/sdl/image.d
r80 r90 142 142 } 143 143 144 public void DerelictSDLImage_Unload() 145 { 146 if(hsdlImg !== null) 147 ExeModule_Release(hsdlImg); 148 } 149 144 150 static ~this() 145 151 { 146 ExeModule_Release(hsdlImg);152 DerelictSDLImage_Unload(); 147 153 } 148 154 trunk/DerelictSDLMixer/derelict/sdl/mixer.d
r80 r90 344 344 } 345 345 346 public void DerelictSDLMixer_Unload() 347 { 348 if(hsdlMixer !== null) 349 ExeModule_Release(hsdlMixer); 350 } 351 346 352 static ~this() 347 353 { 348 ExeModule_Release(hsdlMixer);349 } 354 DerelictSDLMixer_Unload(); 355 } trunk/DerelictSDLNet/derelict/sdl/net.d
r80 r90 31 31 struct IPaddress 32 32 { 33 34 33 Uint32 host; 34 Uint16 port; 35 35 } 36 36 37 37 typedef void* TCPsocket; 38 38 39 const uint INADDR_ANY 40 const uint INADDR_NONE 41 const uint INADDR_BROADCAST 42 43 const uint SDLNET_MAX_UDPCHANNELS 44 const uint SDLNET_MAX_UDPADDRESSES 39 const uint INADDR_ANY = 0x00000000; 40 const uint INADDR_NONE = 0xFFFFFFFF; 41 const uint INADDR_BROADCAST = 0xFFFFFFFF; 42 43 const uint SDLNET_MAX_UDPCHANNELS = 32; 44 const uint SDLNET_MAX_UDPADDRESSES = 4; 45 45 46 46 typedef void* UDPsocket; … … 48 48 struct UDPpacket 49 49 { 50 51 52 53 54 55 50 int channel; 51 Uint8 *data; 52 int len; 53 int maxlen; 54 int status; 55 IPaddress address; 56 56 } 57 57 … … 60 60 struct _SDLNet_GenericSocket 61 61 { 62 62 int ready; 63 63 } 64 64 alias _SDLNet_GenericSocket* SDLNet_GenericSocket; … … 72 72 int SDLNet_TCP_AddSocket(SDLNet_SocketSet set, TCPsocket sock) 73 73 { 74 74 return SDLNet_AddSocket(set, cast(SDLNet_GenericSocket)sock); 75 75 } 76 76 77 77 int SDLNet_TCP_DelSocket(SDLNet_SocketSet set, TCPsocket sock) 78 78 { 79 79 return SDLNet_DelSocket(set, cast(SDLNet_GenericSocket)sock); 80 80 } 81 81 82 82 int SDLNet_UDP_AddSocket(SDLNet_SocketSet set, UDPsocket sock) 83 83 { 84 84 return SDLNet_AddSocket(set, cast(SDLNet_GenericSocket)sock); 85 85 } 86 86 87 87 int SDLNet_UDP_DelSocket(SDLNet_SocketSet set, UDPsocket sock) 88 88 { 89 89 return SDLNet_DelSocket(set, cast(SDLNet_GenericSocket)sock); 90 90 } 91 91 92 92 bit SDLNet_SocketReady(TCPsocket sock) 93 93 { 94 return ((sock !== null) && (cast(SDLNet_GenericSocket)sock).ready); 94 return ((sock !== null) && (cast(SDLNet_GenericSocket)sock).ready); 95 95 } 96 96 97 97 bit SDLNet_SocketReady(UDPsocket sock) 98 98 { 99 99 return ((sock !== null) && (cast(SDLNet_GenericSocket)sock).ready); 100 100 } 101 101 102 102 void SDLNet_Write16(Uint16 value, void* areap) 103 103 { 104 105 104 Uint16* areap16 = cast(Uint16*)areap; 105 *areap16 = SDL_SwapBE16(value); 106 106 } 107 107 108 108 Uint16 SDLNet_Read16(void *areap) 109 109 { 110 111 110 Uint16* areap16 = cast(Uint16*)areap; 111 return SDL_SwapBE16(*areap16); 112 112 } 113 113 114 114 void SDLNet_Write32(Uint32 value, void* areap) 115 115 { 116 117 *areap32 = SDL_SwapBE32(value); 116 Uint32* areap32 = cast(Uint32*)areap; 117 *areap32 = SDL_SwapBE32(value); 118 118 } 119 119 120 120 Uint32 SDLNet_Read32(void* areap) 121 121 { 122 123 122 Uint32* areap32 = cast(Uint32*)areap; 123 return SDL_SwapBE32(*areap32); 124 124 } 125 125 … … 131 131 typedef int function() pfSDLNet_Init; 132 132 typedef void function() pfSDLNet_Quit; 133 pfSDLNet_Init 134 pfSDLNet_Quit 133 pfSDLNet_Init SDLNet_Init; 134 pfSDLNet_Quit SDLNet_Quit; 135 135 136 136 typedef int function(IPaddress*, char*, Uint16) pfSDLNet_ResolveHost; 137 137 typedef char* function(IPaddress*) pfSDLNet_ResolveIP; 138 pfSDLNet_ResolveHost 139 pfSDLNet_ResolveIP 138 pfSDLNet_ResolveHost SDLNet_ResolveHost; 139 pfSDLNet_ResolveIP SDLNet_ResolveIP; 140 140 141 141 typedef TCPsocket function(IPaddress*) pfSDLNet_TCP_Open; … … 145 145 typedef int function(TCPsocket,void*,int) pfSDLNet_TCP_Recv; 146 146 typedef void function(TCPsocket) pfSDLNet_TCP_Close; 147 pfSDLNet_TCP_Open 148 pfSDLNet_TCP_Accept 149 pfSDLNet_TCP_GetPeerAddress 150 pfSDLNet_TCP_Send 151 pfSDLNet_TCP_Recv 152 pfSDLNet_TCP_Close 147 pfSDLNet_TCP_Open SDLNet_TCP_Open; 148 pfSDLNet_TCP_Accept SDLNet_TCP_Accept; 149 pfSDLNet_TCP_GetPeerAddress SDLNet_TCP_GetPeerAddress; 150 pfSDLNet_TCP_Send SDLNet_TCP_Send; 151 pfSDLNet_TCP_Recv SDLNet_TCP_Recv; 152 pfSDLNet_TCP_Close SDLNet_TCP_Close; 153 153 154 154 typedef UDPpacket* function(int) pfSDLNet_AllocPacket; … … 157 157 typedef UDPpacket** function(int,int) pfSDLNet_AllocPacketV; 158 158 typedef void function(UDPpacket**) pfSDLNet_FreePacketV; 159 pfSDLNet_AllocPacket 160 pfSDLNet_ResizePacket 161 pfSDLNet_FreePacket 162 pfSDLNet_AllocPacketV 163 pfSDLNet_FreePacketV 159 pfSDLNet_AllocPacket SDLNet_AllocPacket; 160 pfSDLNet_ResizePacket SDLNet_ResizePacket; 161 pfSDLNet_FreePacket SDLNet_FreePacket; 162 pfSDLNet_AllocPacketV SDLNet_AllocPacketV; 163 pfSDLNet_FreePacketV SDLNet_FreePacketV; 164 164 165 165 typedef UDPsocket function(Uint16) pfSDLNet_UDP_Open; … … 172 172 typedef int function(UDPsocket,UDPpacket*) pfSDLNet_UDP_Recv; 173 173 typedef void function(UDPsocket) pfSDLNet_UDP_Close; 174 pfSDLNet_UDP_Open 175 pfSDLNet_UDP_Bind 176 pfSDLNet_UDP_Unbind 177 pfSDLNet_UDP_GetPeerAddress 178 pfSDLNet_UDP_SendV 179 pfSDLNet_UDP_Send 180 pfSDLNet_UDP_RecvV 181 pfSDLNet_UDP_Recv 182 pfSDLNet_UDP_Close 174 pfSDLNet_UDP_Open SDLNet_UDP_Open; 175 pfSDLNet_UDP_Bind SDLNet_UDP_Bind; 176 pfSDLNet_UDP_Unbind SDLNet_UDP_Unbind; 177 pfSDLNet_UDP_GetPeerAddress SDLNet_UDP_GetPeerAddress; 178 pfSDLNet_UDP_SendV SDLNet_UDP_SendV; 179 pfSDLNet_UDP_Send SDLNet_UDP_Send; 180 pfSDLNet_UDP_RecvV SDLNet_UDP_RecvV; 181 pfSDLNet_UDP_Recv SDLNet_UDP_Recv; 182 pfSDLNet_UDP_Close SDLNet_UDP_Close; 183 183 184 184 typedef SDLNet_SocketSet function(int) pfSDLNet_AllocSocketSet; … … 187 187 typedef int function(SDLNet_SocketSet,Uint32) pfSDLNet_CheckSockets; 188 188 typedef void function(SDLNet_SocketSet) pfSDLNet_FreeSocketSet; 189 pfSDLNet_AllocSocketSet 190 pfSDLNet_AddSocket 191 pfSDLNet_DelSocket 192 pfSDLNet_CheckSockets 193 pfSDLNet_FreeSocketSet 189 pfSDLNet_AllocSocketSet SDLNet_AllocSocketSet; 190 pfSDLNet_AddSocket SDLNet_AddSocket; 191 pfSDLNet_DelSocket SDLNet_DelSocket; 192 pfSDLNet_CheckSockets SDLNet_CheckSockets; 193 pfSDLNet_FreeSocketSet SDLNet_FreeSocketSet; 194 194 195 195 /* … … 198 198 typedef Uint16 function(void*) pfSDLNet_Read16; 199 199 typedef Uint32 function(void*) pfSDLNet_Read32; 200 pfSDLNet_Write16 201 pfSDLNet_Write32 202 pfSDLNet_Read16 203 pfSDLNet_Read32 200 pfSDLNet_Write16 SDLNet_Write16; 201 pfSDLNet_Write32 SDLNet_Write32; 202 pfSDLNet_Read16 SDLNet_Read16; 203 pfSDLNet_Read32 SDLNet_Read32; 204 204 */ 205 205 … … 213 213 private void* getProc(char[] procname) 214 214 { 215 216 217 218 215 void *symbol = ExeModule_GetSymbol(hsdlNet, procname); 216 if(symbol is null) 217 throw new Exception("Failed to load SDLNet proc address " ~ procname); 218 return symbol; 219 219 } 220 220 221 221 private void load() 222 222 { 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 223 SDLNet_Init = cast(pfSDLNet_Init)getProc("SDLNet_Init"); 224 SDLNet_Quit = cast(pfSDLNet_Quit)getProc("SDLNet_Quit"); 225 SDLNet_ResolveHost = cast(pfSDLNet_ResolveHost)getProc("SDLNet_ResolveHost"); 226 SDLNet_ResolveIP = cast(pfSDLNet_ResolveIP)getProc("SDLNet_ResolveIP"); 227 SDLNet_TCP_Open = cast(pfSDLNet_TCP_Open)getProc("SDLNet_TCP_Open"); 228 SDLNet_TCP_Accept = cast(pfSDLNet_TCP_Accept)getProc("SDLNet_TCP_Accept"); 229 SDLNet_TCP_GetPeerAddress = cast(pfSDLNet_TCP_GetPeerAddress)getProc("SDLNet_TCP_GetPeerAddress"); 230 SDLNet_TCP_Send = cast(pfSDLNet_TCP_Send)getProc("SDLNet_TCP_Send"); 231 SDLNet_TCP_Recv = cast(pfSDLNet_TCP_Recv)getProc("SDLNet_TCP_Recv"); 232 SDLNet_TCP_Close = cast(pfSDLNet_TCP_Close)getProc("SDLNet_TCP_Close"); 233 SDLNet_AllocPacket = cast(pfSDLNet_AllocPacket)getProc("SDLNet_AllocPacket"); 234 SDLNet_ResizePacket = cast(pfSDLNet_ResizePacket)getProc("SDLNet_ResizePacket"); 235 SDLNet_FreePacket = cast(pfSDLNet_FreePacket)getProc("SDLNet_FreePacket"); 236 SDLNet_AllocPacketV = cast(pfSDLNet_AllocPacketV)getProc("SDLNet_AllocPacketV"); 237 SDLNet_FreePacketV = cast(pfSDLNet_FreePacketV)getProc("SDLNet_FreePacketV"); 238 SDLNet_UDP_Open = cast(pfSDLNet_UDP_Open)getProc("SDLNet_UDP_Open"); 239 SDLNet_UDP_Bind = cast(pfSDLNet_UDP_Bind)getProc("SDLNet_UDP_Bind"); 240 SDLNet_UDP_Unbind = cast(pfSDLNet_UDP_Unbind)getProc("SDLNet_UDP_Unbind"); 241 SDLNet_UDP_GetPeerAddress = cast(pfSDLNet_UDP_GetPeerAddress)getProc("SDLNet_UDP_GetPeerAddress"); 242 SDLNet_UDP_SendV = cast(pfSDLNet_UDP_SendV)getProc("SDLNet_UDP_SendV"); 243 SDLNet_UDP_Send = cast(pfSDLNet_UDP_Send)getProc("SDLNet_UDP_Send"); 244 SDLNet_UDP_RecvV = cast(pfSDLNet_UDP_RecvV)getProc("SDLNet_UDP_RecvV"); 245 SDLNet_UDP_Recv = cast(pfSDLNet_UDP_Recv)getProc("SDLNet_UDP_Recv"); 246 SDLNet_UDP_Close = cast(pfSDLNet_UDP_Close)getProc("SDLNet_UDP_Close"); 247 SDLNet_AllocSocketSet = cast(pfSDLNet_AllocSocketSet)getProc("SDLNet_AllocSocketSet"); 248 SDLNet_AddSocket = cast(pfSDLNet_AddSocket)getProc("SDLNet_AddSocket"); 249 SDLNet_DelSocket = cast(pfSDLNet_DelSocket)getProc("SDLNet_DelSocket"); 250 SDLNet_CheckSockets = cast(pfSDLNet_CheckSockets)getProc("SDLNet_CheckSockets"); 251 SDLNet_FreeSocketSet = cast(pfSDLNet_FreeSocketSet)getProc("SDLNet_FreeSocketSet"); 252 252 } 253 253 254 254 public void DerelictSDLNet_Load(char[] libName) 255 255 { 256 257 258 259 260 261 262 263 264 256 if(hsdlNet !== null) 257 return; 258 259 hsdlNet = ExeModule_Load(libName); 260 261 if(hsdlNet is null) 262 throw new Exception("Failed to load the SDL_net shared library."); 263 264 load(); 265 265 } 266 266 267 267 public void DerelictSDLNet_Load() 268 268 { 269 version(Windows) 270 DerelictSDLNet_Load("SDL_net.dll"); 271 version(linux) 272 DerelictSDLNet_Load("libSDL_net.so"); 269 version(Windows) 270 DerelictSDLNet_Load("SDL_net.dll"); 271 version(linux) 272 DerelictSDLNet_Load("libSDL_net.so"); 273 } 274 275 public void DerelictSDLNet_Unload() 276 { 277 if(hsdlNet !== null) 278 ExeModule_Release(hsdlNet); 273 279 } 274 280 275 281 static ~this() 276 282 { 277 ExeModule_Release(hsdlNet);278 } 283 DerelictSDLNet_Unload(); 284 } trunk/DerelictSDLttf/derelict/sdl/ttf.d
r80 r90 25 25 /* This library is a wrapper around the excellent FreeType 2.0 library, 26 26 available at: 27 27 http://www.freetype.org/ 28 28 */ 29 29 … … 43 43 void SDL_TTF_VERSION(SDL_version* X) 44 44 { 45 46 47 45 X.major = SDL_TTF_MAJOR_VERSION; 46 X.minor = SDL_TTF_MINOR_VERSION; 47 X.patch = SDL_TTF_PATCHLEVEL; 48 48 } 49 49 … … 146 146 pfTTF_RenderGlyph_Shaded TTF_RenderGlyph_Shaded; 147 147 pfTTF_RenderText_Blended TTF_RenderText_Blended; 148 pfTTF_RenderUTF8_Blended 148 pfTTF_RenderUTF8_Blended TTF_RenderUTF8_Blended; 149 149 pfTTF_RenderUNICODE_Blended TTF_RenderUNICODE_Blended; 150 150 pfTTF_RenderGlyph_Blended TTF_RenderGlyph_Blended; … … 219 219 return; 220 220 221 hsdlttf = ExeModule_Load(libName); 222 221 hsdlttf = ExeModule_Load(libName); 222 223 223 if(hsdlttf is null) 224 224 throw new Exception("Failed to load the SDL_ttf shared library."); 225 225 226 226 load(); … … 229 229 public void DerelictSDLttf_Load() 230 230 { 231 version(Windows) 232 DerelictSDLttf_Load("SDL_ttf.dll"); 233 version(linux) 234 DerelictSDLttf_Load("libSDL_ttf.so"); 231 version(Windows) 232 DerelictSDLttf_Load("SDL_ttf.dll"); 233 version(linux) 234 DerelictSDLttf_Load("libSDL_ttf.so"); 235 } 236 237 public void DerelictSDLttf_Unload() 238 { 239 if(hsdlttf !== null) 240 ExeModule_Release(hsdlttf); 235 241 } 236 242 237 243 static ~this() 238 244 { 239 ExeModule_Release(hsdlttf);240 } 245 DerelictSDLttf_Unload(); 246 }