diff --git a/Oolite.xcodeproj/project.pbxproj b/Oolite.xcodeproj/project.pbxproj index 26444dc3..f24f1ffb 100644 --- a/Oolite.xcodeproj/project.pbxproj +++ b/Oolite.xcodeproj/project.pbxproj @@ -102,7 +102,6 @@ 2516115F099544390037C2E1 /* SkyEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 2516110D099544390037C2E1 /* SkyEntity.m */; }; 25161160099544390037C2E1 /* SkyEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 2516110E099544390037C2E1 /* SkyEntity.h */; }; 25161162099544390037C2E1 /* OOTrumble.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161110099544390037C2E1 /* OOTrumble.h */; }; - 25161163099544390037C2E1 /* OOSoundSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161111099544390037C2E1 /* OOSoundSource.h */; }; 25161166099544390037C2E1 /* DustEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161114099544390037C2E1 /* DustEntity.m */; }; 25161168099544390037C2E1 /* OOSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161116099544390037C2E1 /* OOSound.h */; }; 2516116B099544390037C2E1 /* OOFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161119099544390037C2E1 /* OOFileManager.m */; }; @@ -433,8 +432,6 @@ 2512834409BA281500F43D55 /* CollisionRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CollisionRegion.h; path = src/Core/CollisionRegion.h; sourceTree = ""; }; 2512834509BA281500F43D55 /* CollisionRegion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CollisionRegion.m; path = src/Core/CollisionRegion.m; sourceTree = ""; }; 25160E2E0995362F0037C2E1 /* OOCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOCocoa.h; path = src/Core/OOCocoa.h; sourceTree = ""; }; - 25160E67099539D50037C2E1 /* libOgg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOgg.a; path = "Cocoa-deps/Ogg Vorbis/libOgg.a"; sourceTree = ""; }; - 25160E68099539D50037C2E1 /* libVorbisAll.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libVorbisAll.a; path = "Cocoa-deps/Ogg Vorbis/libVorbisAll.a"; sourceTree = ""; }; 251610CA099544090037C2E1 /* OOCABufferedSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOCABufferedSound.h; path = src/Cocoa/OOCABufferedSound.h; sourceTree = ""; }; 251610CB099544090037C2E1 /* OOCASoundMixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOCASoundMixer.h; path = src/Cocoa/OOCASoundMixer.h; sourceTree = ""; }; 251610CC099544090037C2E1 /* OOCASoundSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOCASoundSource.h; path = src/Cocoa/OOCASoundSource.h; sourceTree = ""; }; @@ -478,7 +475,6 @@ 2516110D099544390037C2E1 /* SkyEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SkyEntity.m; path = src/Core/SkyEntity.m; sourceTree = ""; }; 2516110E099544390037C2E1 /* SkyEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkyEntity.h; path = src/Core/SkyEntity.h; sourceTree = ""; }; 25161110099544390037C2E1 /* OOTrumble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOTrumble.h; path = src/Core/OOTrumble.h; sourceTree = ""; }; - 25161111099544390037C2E1 /* OOSoundSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOSoundSource.h; path = src/Core/OOSoundSource.h; sourceTree = ""; }; 25161114099544390037C2E1 /* DustEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DustEntity.m; path = src/Core/DustEntity.m; sourceTree = ""; }; 25161116099544390037C2E1 /* OOSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OOSound.h; path = src/Core/OOSound.h; sourceTree = ""; }; 25161119099544390037C2E1 /* OOFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OOFileManager.m; path = src/Core/OOFileManager.m; sourceTree = ""; }; @@ -1001,8 +997,8 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 25160E67099539D50037C2E1 /* libOgg.a */, - 25160E68099539D50037C2E1 /* libVorbisAll.a */, + 25F3E8E9099502BB002F25FD /* libOgg.a */, + 25F3E8EA099502BB002F25FD /* libVorbisAll.a */, 0878FD2F086EF845004CB752 /* Carbon.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, 06AFA01500A58FB77F000001 /* OpenGL.framework */, @@ -1068,7 +1064,6 @@ 2516113A099544390037C2E1 /* ResourceManager.h */, 2516111A099544390037C2E1 /* OOFileManager.h */, 25161119099544390037C2E1 /* OOFileManager.m */, - 25161111099544390037C2E1 /* OOSoundSource.h */, 25161144099544390037C2E1 /* Universe.h */, 25161143099544390037C2E1 /* Universe.m */, 25161104099544390037C2E1 /* Entity.h */, @@ -1168,8 +1163,6 @@ 29B97314FDCFA39411CA2CEA /* Oolite_GUSTO */ = { isa = PBXGroup; children = ( - 25F3E8E9099502BB002F25FD /* libOgg.a */, - 25F3E8EA099502BB002F25FD /* libVorbisAll.a */, 0870F6230903F890002A598D /* Groolite */, 25F3E6300994F033002F25FD /* legacy_random.h */, 25F3E6320994F04C002F25FD /* legacy_random.c */, @@ -1266,7 +1259,6 @@ 2516115D099544390037C2E1 /* GameController.h in Headers */, 25161160099544390037C2E1 /* SkyEntity.h in Headers */, 25161162099544390037C2E1 /* OOTrumble.h in Headers */, - 25161163099544390037C2E1 /* OOSoundSource.h in Headers */, 25161168099544390037C2E1 /* OOSound.h in Headers */, 2516116C099544390037C2E1 /* OOFileManager.h in Headers */, 2516116E099544390037C2E1 /* OOCharacter.h in Headers */, @@ -1748,7 +1740,7 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; OTHER_CFLAGS = "-DLOADSAVEGUI"; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; }; name = Development; }; @@ -1767,7 +1759,7 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; OTHER_CFLAGS = "-DLOADSAVEGUI"; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; }; name = Deployment; }; diff --git a/src/Cocoa/MyOpenGLView.h b/src/Cocoa/MyOpenGLView.h index 4a4cb839..f388dad8 100644 --- a/src/Cocoa/MyOpenGLView.h +++ b/src/Cocoa/MyOpenGLView.h @@ -1,37 +1,25 @@ /* - * - * Oolite - * - * Created by Giles Williams on Sat Apr 03 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * -Copyright (c) 2004, Giles C Williams -All rights reserved. +MyOpenGLView.h +Created by Giles Williams on 2004-04-03. -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +For Oolite +Copyright (C) 2004 Giles C Williams -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/MyOpenGLView.m b/src/Cocoa/MyOpenGLView.m index c4ec38da..66c07924 100644 --- a/src/Cocoa/MyOpenGLView.m +++ b/src/Cocoa/MyOpenGLView.m @@ -1,37 +1,25 @@ /* - * - * Oolite - * - * Created by Giles Williams on Sat Apr 03 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * -Copyright (c) 2004, Giles C Williams -All rights reserved. +MyOpenGLView.m +Created by Giles Williams on 2004-04-03. -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +For Oolite +Copyright (C) 2004 Giles C Williams -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCABufferedSound.h b/src/Cocoa/OOCABufferedSound.h index 3503801b..31695bed 100644 --- a/src/Cocoa/OOCABufferedSound.h +++ b/src/Cocoa/OOCABufferedSound.h @@ -1,32 +1,28 @@ -// -// OOCABufferedSound.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCABufferedSound.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Subclass of OOSound playing from an in-memory buffer. -You are free: +This class is an implementation detail. Do not use it directly; use OOSound. -• to copy, distribute, display, and perform the work -• to make derivative works +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -Under the following conditions: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCABufferedSound.m b/src/Cocoa/OOCABufferedSound.m index edf35dc8..cd6f1ba9 100644 --- a/src/Cocoa/OOCABufferedSound.m +++ b/src/Cocoa/OOCABufferedSound.m @@ -1,32 +1,24 @@ -// -// OOCABufferedSound.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCABufferedSound.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCAMusic.h b/src/Cocoa/OOCAMusic.h index d61b373c..d96a3e94 100644 --- a/src/Cocoa/OOCAMusic.h +++ b/src/Cocoa/OOCAMusic.h @@ -1,38 +1,32 @@ -// -// OOCAMusic.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCAMusic.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Subclass of OOSound with additional controls specific to music playback. Only +one instance of OOMusic may be playing at a time. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ #import -#import "OOSound.h" +#import "OOCASound.h" @interface OOMusic: OOSound diff --git a/src/Cocoa/OOCAMusic.m b/src/Cocoa/OOCAMusic.m index 8096f1e4..eeba511b 100644 --- a/src/Cocoa/OOCAMusic.m +++ b/src/Cocoa/OOCAMusic.m @@ -1,33 +1,24 @@ -// -// OOCAMusic.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCAMusic.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASound.h b/src/Cocoa/OOCASound.h index a8ad7f68..f767564b 100644 --- a/src/Cocoa/OOCASound.h +++ b/src/Cocoa/OOCASound.h @@ -1,32 +1,26 @@ -// -// OOCASound.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASound.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Abstract base class for sounds, and primary sound loading interface. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -¥ to copy, distribute, display, and perform the work -¥ to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -¥ Attribution. You must give the original author credit. -¥ Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASound.m b/src/Cocoa/OOCASound.m index 2ac6410a..9679ff4e 100644 --- a/src/Cocoa/OOCASound.m +++ b/src/Cocoa/OOCASound.m @@ -1,38 +1,32 @@ -// -// OOCASound.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASound.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ -/* OOSound is a class cluster. A single OOSound object exists, which represents a sound that has - been alloced but not inited. The designated initialiser returns a concrete subclass, either - OOCABufferedSound or OOCAStreamingSound, depending on the size of the sound data. + +/* OOSound is a class cluster. A single OOSound object exists, which + represents a sound that has been alloced but not inited. The designated + initialiser returns a concrete subclass, either OOCABufferedSound or + OOCAStreamingSound, depending on the size of the sound data. */ #import "OOCASoundInternal.h" diff --git a/src/Cocoa/OOCASoundChannel.h b/src/Cocoa/OOCASoundChannel.h index 14c12219..bd89392b 100644 --- a/src/Cocoa/OOCASoundChannel.h +++ b/src/Cocoa/OOCASoundChannel.h @@ -1,32 +1,29 @@ -// -// OOCASoundChannel.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASoundChannel.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +A channel for audio playback. -You are free: +This class is an implementation detail. Do not use it directly; use an +OOSoundSource to play an OOSound. -• to copy, distribute, display, and perform the work -• to make derivative works +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -Under the following conditions: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundChannel.m b/src/Cocoa/OOCASoundChannel.m index d4a16a70..a138c1ee 100644 --- a/src/Cocoa/OOCASoundChannel.m +++ b/src/Cocoa/OOCASoundChannel.m @@ -1,32 +1,24 @@ -// -// OOCASoundChannel.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASoundChannel.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundDecoder.h b/src/Cocoa/OOCASoundDecoder.h index ae825ba0..26b5a3c1 100644 --- a/src/Cocoa/OOCASoundDecoder.h +++ b/src/Cocoa/OOCASoundDecoder.h @@ -1,32 +1,28 @@ -// -// OOCASoundDecoder.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASoundDecoder.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Class responsible for converting a sound to a PCM buffer for playback. This +class is an implementation detail. Do not use it directly; use OOSound to +load sounds. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundDecoder.m b/src/Cocoa/OOCASoundDecoder.m index 75e48411..296ff0f2 100644 --- a/src/Cocoa/OOCASoundDecoder.m +++ b/src/Cocoa/OOCASoundDecoder.m @@ -1,32 +1,24 @@ -// -// OOCASoundDecoder.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASoundDecoder.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundInternal.h b/src/Cocoa/OOCASoundInternal.h index 91b3507c..93a9e9a3 100644 --- a/src/Cocoa/OOCASoundInternal.h +++ b/src/Cocoa/OOCASoundInternal.h @@ -1,32 +1,27 @@ -// -// OOCASoundInternal.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCASoundInternal.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Declarations used within OOCASound. This file should not be used by client +code. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundMixer.h b/src/Cocoa/OOCASoundMixer.h index 6fcf7f03..7d783a25 100644 --- a/src/Cocoa/OOCASoundMixer.h +++ b/src/Cocoa/OOCASoundMixer.h @@ -1,32 +1,28 @@ -// -// OOCASoundMixer.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundMixer.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Class responsible for managing and mixing sound channels. This class is an +implementation detail. Do not use it directly; use an OOSoundSource to play an +OOSound. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundMixer.m b/src/Cocoa/OOCASoundMixer.m index 78d788ad..e37fd029 100644 --- a/src/Cocoa/OOCASoundMixer.m +++ b/src/Cocoa/OOCASoundMixer.m @@ -1,32 +1,28 @@ -// -// OOCASoundMixer.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundMixer.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Class responsible for managing and mixing sound channels. This class is an +implementation detail. Do not use it directly; use an OOSoundSource to play an +OOSound. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundReferencePoint.h b/src/Cocoa/OOCASoundReferencePoint.h index 97897475..e33f856d 100644 --- a/src/Cocoa/OOCASoundReferencePoint.h +++ b/src/Cocoa/OOCASoundReferencePoint.h @@ -1,32 +1,28 @@ -// -// OOCASoundReferencePoint.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundReferencePoint.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +A reference point for positional audio. The position of an OOSoundSource is +specified relative to an OOSoundReferencePoint. Since positional audio is +currently unimplemented, this class does nothing. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundReferencePoint.m b/src/Cocoa/OOCASoundReferencePoint.m index 9c91ab78..ba072345 100644 --- a/src/Cocoa/OOCASoundReferencePoint.m +++ b/src/Cocoa/OOCASoundReferencePoint.m @@ -1,32 +1,24 @@ -// -// OOCASoundReferencePoint.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundReferencePoint.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundSource.h b/src/Cocoa/OOCASoundSource.h index 918369e8..a7e9ee95 100644 --- a/src/Cocoa/OOCASoundSource.h +++ b/src/Cocoa/OOCASoundSource.h @@ -1,32 +1,30 @@ -// -// OOCASoundSource.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundSource.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +A sound source. +Each playing sound is associated with a sound source, either explicitly or by +creating one on the fly. Each sound source can play one sound at a time, and +has a number of attributes related to positional audio (which is currently +unimplemented). -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCASoundSource.m b/src/Cocoa/OOCASoundSource.m index 4337b0af..fbd29109 100644 --- a/src/Cocoa/OOCASoundSource.m +++ b/src/Cocoa/OOCASoundSource.m @@ -1,32 +1,24 @@ -// -// OOCASoundSource.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOCASoundSource.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCAStreamingSound.h b/src/Cocoa/OOCAStreamingSound.h index b12b53e3..b6f7e53f 100644 --- a/src/Cocoa/OOCAStreamingSound.h +++ b/src/Cocoa/OOCAStreamingSound.h @@ -1,33 +1,28 @@ -// -// OOCAStreamingSound.h -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCAStreamingSound.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Subclass of OOSound which streams audio from disk. -You are free: +This class is an implementation detail. Do not use it directly; use OOSound. -• to copy, distribute, display, and perform the work -• to make derivative works +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -Under the following conditions: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• Attribution. You must give the original author credit. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOCAStreamingSound.m b/src/Cocoa/OOCAStreamingSound.m index a17f3048..b41e43cc 100644 --- a/src/Cocoa/OOCAStreamingSound.m +++ b/src/Cocoa/OOCAStreamingSound.m @@ -1,33 +1,26 @@ -// -// OOCAStreamingSound.m -// CoreAudio sound implementation for Oolite -// /* -Copyright © 2005-2006 Jens Ayton -All rights reserved. +OOCAStreamingSound.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +This class is an implementation detail. Do not use it directly; use OOSound. -You are free: +OOCASound - Core Audio sound implementation for Oolite. +Copyright (C) 2005-2006 Jens Ayton -• to copy, distribute, display, and perform the work -• to make derivative works +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Under the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• Attribution. You must give the original author credit. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Cocoa/OOErrorDescription.h b/src/Cocoa/OOErrorDescription.h index 6512e4de..0e9eea45 100644 --- a/src/Cocoa/OOErrorDescription.h +++ b/src/Cocoa/OOErrorDescription.h @@ -1,31 +1,14 @@ -// -// OOErrorDescription.h -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOErrorDescription.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +A set of functions for mapping various types of Mac OS error codes to names, +primarily for debugging purposes. -You are free: +For OOCASound - Core Audio sound implementation for Oolite. +By Jens Ayton, 2005 -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +This file is hereby placed in the public domain. */ diff --git a/src/Cocoa/OOErrorDescription.m b/src/Cocoa/OOErrorDescription.m index 5b577a4a..d02ac086 100644 --- a/src/Cocoa/OOErrorDescription.m +++ b/src/Cocoa/OOErrorDescription.m @@ -1,31 +1,14 @@ -// -// OOErrorDescription.m -// /* -Copyright © 2005 Jens Ayton -All rights reserved. +OOErrorDescription.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +A set of functions for mapping various types of Mac OS error codes to names, +primarily for debugging purposes. -You are free: +For OOCASound - Core Audio sound implementation for Oolite. +By Jens Ayton, 2005 -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. -• Share Alike. If you alter, transform, or build upon this work, - you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +This file is hereby placed in the public domain. */ diff --git a/src/Core/OOBrain.h b/src/Core/OOBrain.h index 11be413c..dd2fdd3d 100644 --- a/src/Core/OOBrain.h +++ b/src/Core/OOBrain.h @@ -1,10 +1,29 @@ -// -// OOBrain.h -// Oolite -// -// Created by Giles Williams on 21/07/2006. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// +/* + +OOBrain.h +Created by Giles Williams on 2006-07-21. + +Part of NPC behaviour implementation. + +For Oolite +Copyright (C) 2006 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #include "OOCocoa.h" diff --git a/src/Core/OOBrain.m b/src/Core/OOBrain.m index 2e19c5bd..acfb3cb2 100644 --- a/src/Core/OOBrain.m +++ b/src/Core/OOBrain.m @@ -1,10 +1,27 @@ -// -// OOBrain.m -// Oolite -// -// Created by Giles Williams on 21/07/2006. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// +/* + +OOBrain.m +Created by Giles Williams on 2006-07-21. + +For Oolite +Copyright (C) 2006 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #import "OOBrain.h" diff --git a/src/Core/OOCocoa.h b/src/Core/OOCocoa.h index 44b6582d..6232143a 100644 --- a/src/Core/OOCocoa.h +++ b/src/Core/OOCocoa.h @@ -1,4 +1,29 @@ -// Import OpenStep main headers and define some Macisms and other compatibility stuff. +/* + +OOCocoa.h + +Import OpenStep main headers and define some Macisms and other compatibility +stuff. + +For Oolite +Copyright (C) 2004 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #if defined(GNUSTEP) && !defined(OOLITE_SDL_MAC) #include @@ -113,13 +138,21 @@ enum { #else -#define OOLITE_CACHE [[[[NSHomeDirectory() \ - stringByAppendingPathComponent:@"Library"] \ +#if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED +#define OOLITE_CACHE [[[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) \ + objectAtIndex:0] \ + stringByAppendingPathComponent:@"Oolite"] \ + stringByAppendingPathComponent:@"cache"]; +#else +#define OOLITE_CACHE [[[[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) \ + objectAtIndex:0] \ stringByAppendingPathComponent:@"Application Support"] \ stringByAppendingPathComponent:@"Oolite"] \ stringByAppendingPathComponent:@"cache"]; #endif +#endif + #import #import diff --git a/src/Core/OOGLDefs.h b/src/Core/OOGLDefs.h index 830f34be..39a9fe60 100644 --- a/src/Core/OOGLDefs.h +++ b/src/Core/OOGLDefs.h @@ -1,39 +1,32 @@ -#ifndef OOGLDEFS_H -#define OOGLDEFS_H +/* -/* +OOGLDefs.h -oogldefs.h: Constants and definitions for Oolite OpenGL operations +Constants and definitions for Oolite OpenGL operations. -Copyright (c) 2004, Giles C Williams -Some rights reserved. +For Oolite +Copyright (C) 2004 Giles C Williams -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -You are free: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ +#ifndef OOGLDEFS_H +#define OOGLDEFS_H + #define DEMO_LIGHT_POSITION {5000.0f,25000.0f,-10000.0f} diff --git a/src/Core/OOInstinct.h b/src/Core/OOInstinct.h index e12eec18..b77440d4 100644 --- a/src/Core/OOInstinct.h +++ b/src/Core/OOInstinct.h @@ -1,10 +1,29 @@ -// -// OOInstinct.h -// Oolite -// -// Created by Giles Williams on 18/07/2006. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// +/* + +OOInstinct.h +Created by Giles Williams on 2006-07-18. + +Part of NPC behaviour implementation. + +For Oolite +Copyright (C) 2006 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #include "OOCocoa.h" #include "vector.h" diff --git a/src/Core/OOInstinct.m b/src/Core/OOInstinct.m index 3eee56fa..f695fef1 100644 --- a/src/Core/OOInstinct.m +++ b/src/Core/OOInstinct.m @@ -1,10 +1,27 @@ -// -// OOInstinct.m -// Oolite -// -// Created by Giles Williams on 18/07/2006. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// +/* + +OOInstinct.m +Created by Giles Williams on 2006-07-18. + +For Oolite +Copyright (C) 2006 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #import "OOInstinct.h" #import "ShipEntity.h" diff --git a/src/Core/OOOpenGL.h b/src/Core/OOOpenGL.h index 73851f84..21b9006e 100644 --- a/src/Core/OOOpenGL.h +++ b/src/Core/OOOpenGL.h @@ -1,4 +1,28 @@ -// Do whatever is appropriate to get gl.h, glu.h and glext.h included. +/* + +OOOpenGL.h + +Do whatever is appropriate to get gl.h, glu.h and glext.h included. + +For Oolite +Copyright (C) 2004 Giles C Williams + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #ifndef GNUSTEP diff --git a/src/Core/OOSound.h b/src/Core/OOSound.h index a2f43db1..61d14b67 100644 --- a/src/Core/OOSound.h +++ b/src/Core/OOSound.h @@ -1,16 +1,55 @@ -// OOSound.h: Selects the appropriate sound class source file -// depending on the operating system defined. -// -// Add new OS imports here. The -DOS_NAME flag in the GNUmakefile -// will select which one gets compiled. -// -// Dylan Smith, 2005-04-22 +/* + +OOSound.h +Created by Dylan Smith on 2005-04-22. + +Dispatch header to select the appropriate implementation of OOSound. + +Add new OS imports here. The -DOS_NAME flag in the GNUmakefile +will select which one gets compiled. + + +== Overview of Oolite sound architecture == +There are four public sound classes: +* OOSound: represents a sound, i.e. some data that can be played. +* OOMusic: subclass of OOSound with support for looping, and the special + constraint that only one OOMusic may play at a time. +* OOSoundSource: a thing that can play a sound. Each sound played is + conceptually played through a sound source, although this can be + implicit using OOSound's -play method. +* OOSoundReferencePoint: a point in space relative to which a sound source is + positioned. Since positional sound is not implemented, this serves + no practical purpose. + + +For Oolite +Copyright (C) 2005-2007 Dylan Smith and Jens Ayton + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. + +*/ #if defined(LINUX) || defined(OOLITE_SDL_MAC) -#import "SDLSound.h" -#import "SDLMusic.h" + #import "SDLSound.h" + #import "SDLMusic.h" + #import "OOBasicSoundSource.h" + #import "OOBasicSoundReferencePoint.h" #else -#import "OOCASound.h" -#import "OOCAMusic.h" + #import "OOCASound.h" + #import "OOCAMusic.h" + #import "OOCASoundSource.h" + #import "OOCASoundReferencePoint.h" #endif - diff --git a/src/Core/OOSoundSource.h b/src/Core/OOSoundSource.h deleted file mode 100644 index 5fe72505..00000000 --- a/src/Core/OOSoundSource.h +++ /dev/null @@ -1,14 +0,0 @@ -// OOSoundSource.h: Selects the appropriate sound class source file -// depending on the operating system defined. -// -// Add new OS imports here. The -DOS_NAME flag in the GNUmakefile -// will select which one gets compiled. -// -// Jens Ayton, 2005-11-24 - -#if defined(LINUX) || defined(OOLITE_SDL_MAC) -#import "OOBasicSoundSource.h" -#else -#import "OOCASoundSource.h" -#endif - diff --git a/src/Core/Octree.h b/src/Core/Octree.h index b57cbbf6..f167ab77 100644 --- a/src/Core/Octree.h +++ b/src/Core/Octree.h @@ -1,38 +1,27 @@ /* - Oolite +Octtree.h +Created by Giles Williams on 2006-01-31. - Octree.h - - Created by Giles Williams on 31/01/2006. +Octtree class for collision detection. +For Oolite +Copyright (C) 2006 Giles C Williams -Copyright (c) 2005, Giles C Williams -All rights reserved. +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -You are free: - -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Core/Octree.m b/src/Core/Octree.m index dce391dd..cdc85db4 100644 --- a/src/Core/Octree.m +++ b/src/Core/Octree.m @@ -1,38 +1,25 @@ /* - Oolite +Octtree.m +Created by Giles Williams on 2006-01-31. - Octree.m - - Created by Giles Williams on 31/01/2006. +For Oolite +Copyright (C) 2006 Giles C Williams +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -Copyright (c) 2005, Giles C Williams -All rights reserved. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. - -You are free: - -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Core/PlayerEntitySound.m b/src/Core/PlayerEntitySound.m index ebce44ab..710c35de 100644 --- a/src/Core/PlayerEntitySound.m +++ b/src/Core/PlayerEntitySound.m @@ -25,7 +25,6 @@ MA 02110-1301, USA. #import "PlayerEntitySound.h" #import "OOSound.h" -#import "OOSoundSource.h" #import "ResourceManager.h" diff --git a/src/Core/ShipEntity.m b/src/Core/ShipEntity.m index 363bca04..6b81a1e4 100644 --- a/src/Core/ShipEntity.m +++ b/src/Core/ShipEntity.m @@ -1256,7 +1256,7 @@ static NSMutableDictionary* smallOctreeDict = nil; } if ([shipdict objectForKey:@"is_hulk"]) - is_hulk = [(NSString *)[shipdict objectForKey:@"is_hulk"] boolValue]; + is_hulk = [[shipdict objectForKey:@"is_hulk"] boolValue]; // if ([shipdict objectForKey:@"subentities"]) { @@ -8317,7 +8317,9 @@ inline BOOL pairOK(NSString* my_role, NSString* their_role) - (void) sendCoordinatesToPilot { - Entity* scan, *pilot; + Entity *scan; + ShipEntity *scanShip, *pilot; + n_scanned_ships = 0; scan = z_previous; NSLog(@"searching for pilot boat"); @@ -8329,14 +8331,15 @@ inline BOOL pairOK(NSString* my_role, NSString* their_role) { if (scan->isShip) { - NSString *rolesString = [scan roles]; - NSArray *roles = [Entity scanTokensFromString:rolesString]; - if ([roles containsObject:@"pilot"] == YES) + scanShip = (ShipEntity *)scan; + NSArray *scanRoles = [Entity scanTokensFromString:[scanShip roles]]; + + if ([scanRoles containsObject:@"pilot"] == YES) { - if ([scan getPrimaryTargetID] == NO_TARGET) + if ([scanShip getPrimaryTargetID] == NO_TARGET) { NSLog(@"found pilot boat with no target, will use this one"); - pilot = scan; + pilot = scanShip; break; } } diff --git a/src/Core/entities.h b/src/Core/entities.h index ef54ace1..2c0912d5 100644 --- a/src/Core/entities.h +++ b/src/Core/entities.h @@ -1,38 +1,26 @@ /* - * - * Oolite - * - * Created by Giles Williams on Sat Apr 03 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * +entities.h -Copyright (c) 2004, Giles C Williams -All rights reserved. +Because including all of these in a number of places looks messy. -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +For Oolite +Copyright (C) 2004 Giles C Williams -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ @@ -51,6 +39,3 @@ Your fair use and other rights are in no way affected by the above. #import "SkyEntity.h" #import "ParticleEntity.h" #import "WormholeEntity.h" - - - diff --git a/src/Core/vector.c b/src/Core/vector.c index 628c8f77..96a5b109 100755 --- a/src/Core/vector.c +++ b/src/Core/vector.c @@ -1,40 +1,25 @@ /* -Provides utility routines for Vectors, rotation matrices, and conversion to OpenGL transformation matrices - - * - * Oolite - * - * Created by Giles Williams on Sat Apr 03 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * +vector.c +Created by Giles Williams on 2004-04-03. -Copyright (c) 2004, Giles C Williams -All rights reserved. +For Oolite +Copyright (C) 2004 Giles C Williams -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -You are free: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -• to copy, distribute, display, and perform the work -• to make derivative works - -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ diff --git a/src/Core/vector.h b/src/Core/vector.h index 33046f14..f876083c 100755 --- a/src/Core/vector.h +++ b/src/Core/vector.h @@ -1,45 +1,34 @@ -#ifndef _VECTOR_H -#define _VECTOR_H /* -Provides utility routines for Vectors, Quaternions, rotation matrices, and conversion to OpenGL transformation matrices - - * - * Oolite - * - * Created by Giles Williams on Sat Apr 03 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * +vector.h +Created by Giles Williams on 2004-04-03. -Copyright (c) 2004, Giles C Williams -All rights reserved. +For Oolite +Copyright (C) 2004 Giles C Williams -This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Provides utility routines for Vectors, Quaternions, rotation matrices, and +conversion to OpenGL transformation matrices. -You are free: +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. -• to copy, distribute, display, and perform the work -• to make derivative works +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -Under the following conditions: - -• Attribution. You must give the original author credit. - -• Noncommercial. You may not use this work for commercial purposes. - -• Share Alike. If you alter, transform, or build upon this work, -you may distribute the resulting work only under a license identical to this one. - -For any reuse or distribution, you must make clear to others the license terms of this work. - -Any of these conditions can be waived if you get permission from the copyright holder. - -Your fair use and other rights are in no way affected by the above. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +MA 02110-1301, USA. */ +#ifndef _VECTOR_H +#define _VECTOR_H + #import "OOOpenGL.h"