Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled OOEnvironmentCubeMap, will resume post-MNSR.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3287 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-05-05 13:36:16 +00:00
parent b4f537f4b5
commit 29a4ff8c39
3 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -220,8 +220,7 @@ OOLITE_GRAPHICS_MATERIAL_FILES = \
OOPixMapChannelOperations.m \ OOPixMapChannelOperations.m \
OOMultiTextureMaterial.m \ OOMultiTextureMaterial.m \
OOMaterialConvenienceCreators.m \ OOMaterialConvenienceCreators.m \
OOCombinedEmissionMapGenerator.m \ OOCombinedEmissionMapGenerator.m
OOEnvironmentCubeMap.m
OOLITE_GRAPHICS_MISC_FILES = \ OOLITE_GRAPHICS_MISC_FILES = \
OOCrosshairs.m \ OOCrosshairs.m \

19
Oolite.xcodeproj/project.pbxproj
View File

@ -11,6 +11,7 @@
isa = PBXAggregateTarget; isa = PBXAggregateTarget;
buildConfigurationList = 1AD267680C8305A200B4BFD1 /* Build configuration list for PBXAggregateTarget "Build All" */; buildConfigurationList = 1AD267680C8305A200B4BFD1 /* Build configuration list for PBXAggregateTarget "Build All" */;
buildPhases = ( buildPhases = (
1AD267610C83057F00B4BFD1 /* Copy Debug OXP */,
); );
dependencies = ( dependencies = (
1AD267560C83052600B4BFD1 /* PBXTargetDependency */, 1AD267560C83052600B4BFD1 /* PBXTargetDependency */,
@ -319,6 +320,7 @@
1A26D0EB0BCF9D3B0073F257 /* OOTextureLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A26D0E50BCF9D3B0073F257 /* OOTextureLoader.m */; }; 1A26D0EB0BCF9D3B0073F257 /* OOTextureLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A26D0E50BCF9D3B0073F257 /* OOTextureLoader.m */; };
1A26D0F50BCF9D8D0073F257 /* pngusr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A26D0F40BCF9D8D0073F257 /* pngusr.h */; }; 1A26D0F50BCF9D8D0073F257 /* pngusr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A26D0F40BCF9D8D0073F257 /* pngusr.h */; };
1A26D0F60BCF9D8D0073F257 /* pngusr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A26D0F40BCF9D8D0073F257 /* pngusr.h */; }; 1A26D0F60BCF9D8D0073F257 /* pngusr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A26D0F40BCF9D8D0073F257 /* pngusr.h */; };
1A274D2910C1EE61004CDDF5 /* Debug.oxp in Copy Debug OXP */ = {isa = PBXBuildFile; fileRef = 1A3042F410C16DA60056219D /* Debug.oxp */; };
1A27DB3B0C4E349F00CB4CE8 /* OOOXPVerifierStageInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A27DB380C4E349F00CB4CE8 /* OOOXPVerifierStageInternal.h */; }; 1A27DB3B0C4E349F00CB4CE8 /* OOOXPVerifierStageInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A27DB380C4E349F00CB4CE8 /* OOOXPVerifierStageInternal.h */; };
1A27DB3C0C4E349F00CB4CE8 /* OOOXPVerifierStage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A27DB390C4E349F00CB4CE8 /* OOOXPVerifierStage.h */; }; 1A27DB3C0C4E349F00CB4CE8 /* OOOXPVerifierStage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A27DB390C4E349F00CB4CE8 /* OOOXPVerifierStage.h */; };
1A27DB3D0C4E349F00CB4CE8 /* OOOXPVerifierStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A27DB3A0C4E349F00CB4CE8 /* OOOXPVerifierStage.m */; }; 1A27DB3D0C4E349F00CB4CE8 /* OOOXPVerifierStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A27DB3A0C4E349F00CB4CE8 /* OOOXPVerifierStage.m */; };
@ -553,6 +555,7 @@
1A94E4FC0F348D5700F1B5D9 /* delayedReactToAttackAI.plist in Copy AIs */ = {isa = PBXBuildFile; fileRef = 1A94E4FB0F348D4300F1B5D9 /* delayedReactToAttackAI.plist */; }; 1A94E4FC0F348D5700F1B5D9 /* delayedReactToAttackAI.plist in Copy AIs */ = {isa = PBXBuildFile; fileRef = 1A94E4FB0F348D4300F1B5D9 /* delayedReactToAttackAI.plist */; };
1A95338B0C02089E004EBB58 /* material-defaults.plist in Copy Config */ = {isa = PBXBuildFile; fileRef = 1A9533890C02089E004EBB58 /* material-defaults.plist */; }; 1A95338B0C02089E004EBB58 /* material-defaults.plist in Copy Config */ = {isa = PBXBuildFile; fileRef = 1A9533890C02089E004EBB58 /* material-defaults.plist */; };
1A95338C0C02089E004EBB58 /* planetinfo.plist in Copy Config */ = {isa = PBXBuildFile; fileRef = 1A95338A0C02089E004EBB58 /* planetinfo.plist */; }; 1A95338C0C02089E004EBB58 /* planetinfo.plist in Copy Config */ = {isa = PBXBuildFile; fileRef = 1A95338A0C02089E004EBB58 /* planetinfo.plist */; };
1A95BDD5118A2192002EE302 /* ferdelance_redux.png in Copy Debug OXP */ = {isa = PBXBuildFile; fileRef = 1A2318360B9D026D00EF0852 /* ferdelance_redux.png */; };
1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A95C03E118A450E002EE302 /* OOConvertCubeMapToLatLong.h */; }; 1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A95C03E118A450E002EE302 /* OOConvertCubeMapToLatLong.h */; };
1A95C041118A450E002EE302 /* OOConvertCubeMapToLatLong.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A95C03F118A450E002EE302 /* OOConvertCubeMapToLatLong.m */; settings = {COMPILER_FLAGS = "-O3 -ftree-vectorize"; }; }; 1A95C041118A450E002EE302 /* OOConvertCubeMapToLatLong.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A95C03F118A450E002EE302 /* OOConvertCubeMapToLatLong.m */; settings = {COMPILER_FLAGS = "-O3 -ftree-vectorize"; }; };
1AA7FCAB10C2B9BA0058FBED /* OOPlanetDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA7FCA910C2B9BA0058FBED /* OOPlanetDrawable.h */; }; 1AA7FCAB10C2B9BA0058FBED /* OOPlanetDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA7FCA910C2B9BA0058FBED /* OOPlanetDrawable.h */; };
@ -611,8 +614,6 @@
1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB1D16118DCBC0007B9A1F /* OOConcreteTexture.h */; }; 1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB1D16118DCBC0007B9A1F /* OOConcreteTexture.h */; };
1ACB1D19118DCBC0007B9A1F /* OOConcreteTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACB1D17118DCBC0007B9A1F /* OOConcreteTexture.m */; }; 1ACB1D19118DCBC0007B9A1F /* OOConcreteTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACB1D17118DCBC0007B9A1F /* OOConcreteTexture.m */; };
1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB1D1B118DCE5A007B9A1F /* OOTextureInternal.h */; }; 1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB1D1B118DCE5A007B9A1F /* OOTextureInternal.h */; };
1ACB1E2C118E0C82007B9A1F /* OOEnvironmentCubeMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACB1CF0118DBC65007B9A1F /* OOEnvironmentCubeMap.m */; };
1ACB1E2D118E0C83007B9A1F /* OOEnvironmentCubeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB1CEF118DBC65007B9A1F /* OOEnvironmentCubeMap.h */; };
1ACBF0AD0D82F79600CC005F /* OOSoundSourcePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACBF06F0D82DF9B00CC005F /* OOSoundSourcePool.h */; }; 1ACBF0AD0D82F79600CC005F /* OOSoundSourcePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACBF06F0D82DF9B00CC005F /* OOSoundSourcePool.h */; };
1ACBF0AE0D82F79800CC005F /* OOSoundSourcePool.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACBF0700D82DF9B00CC005F /* OOSoundSourcePool.m */; }; 1ACBF0AE0D82F79800CC005F /* OOSoundSourcePool.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACBF0700D82DF9B00CC005F /* OOSoundSourcePool.m */; };
1ACE208F0D805F78009F6957 /* oolite-scarred-metal-specular.png in Copy Textures */ = {isa = PBXBuildFile; fileRef = 1ACE208E0D805F78009F6957 /* oolite-scarred-metal-specular.png */; }; 1ACE208F0D805F78009F6957 /* oolite-scarred-metal-specular.png in Copy Textures */ = {isa = PBXBuildFile; fileRef = 1ACE208E0D805F78009F6957 /* oolite-scarred-metal-specular.png */; };
@ -1110,6 +1111,18 @@
name = "Copy Shaders"; name = "Copy Shaders";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
1AD267610C83057F00B4BFD1 /* Copy Debug OXP */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = AddOns;
dstSubfolderSpec = 16;
files = (
1A274D2910C1EE61004CDDF5 /* Debug.oxp in Copy Debug OXP */,
1A95BDD5118A2192002EE302 /* ferdelance_redux.png in Copy Debug OXP */,
);
name = "Copy Debug OXP";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@ -3241,7 +3254,6 @@
1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */, 1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */,
1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */, 1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */,
1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */, 1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */,
1ACB1E2D118E0C83007B9A1F /* OOEnvironmentCubeMap.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -3613,7 +3625,6 @@
1A19783F117F81B10060DB56 /* OOPixMapChannelOperations.m in Sources */, 1A19783F117F81B10060DB56 /* OOPixMapChannelOperations.m in Sources */,
1A95C041118A450E002EE302 /* OOConvertCubeMapToLatLong.m in Sources */, 1A95C041118A450E002EE302 /* OOConvertCubeMapToLatLong.m in Sources */,
1ACB1D19118DCBC0007B9A1F /* OOConcreteTexture.m in Sources */, 1ACB1D19118DCBC0007B9A1F /* OOConcreteTexture.m in Sources */,
1ACB1E2C118E0C82007B9A1F /* OOEnvironmentCubeMap.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

27
src/Core/Entities/PlayerEntity.m
View File

@ -64,10 +64,6 @@ MA 02110-1301, USA.
#import "OOEquipmentType.h" #import "OOEquipmentType.h"
#import "OOCamera.h" #import "OOCamera.h"
#import "OOEnvironmentCubeMap.h"
#import "OOPixMap.h"
#import "OOProfilingStopwatch.h"
#import "OOScript.h" #import "OOScript.h"
#import "OOScriptTimer.h" #import "OOScriptTimer.h"
@ -7677,27 +7673,4 @@ static NSString *last_outfitting_key=nil;
} }
#endif #endif
#ifndef NDEBUG
/* Temporary function for testing OOEnvironmentCubeMap. Call from JS console:
PS.call("debugDumpEnvironmentProbe")
*/
- (void) debugDumpEnvironmentProbe
{
static unsigned dumpID = 0;
OOEnvironmentCubeMap *env = [[OOEnvironmentCubeMap alloc] initWithSideLength:1024];
OOProfilingStopwatch *stopwatch = [OOProfilingStopwatch new];
[env render];
OOLog(@"envmap.render", @"Rendered environment in %g seconds.", [stopwatch reset]);
OOPixMap pm = [env copyPixMapRepresentation];
OOLog(@"envmap.render", @"Read back in %g seconds.", [stopwatch reset]);
OODumpPixMap(pm, [NSString stringWithFormat:@"environment cube map %u", ++dumpID]);
OOLog(@"envmap.render", @"Wrote environment dump %u in %g seconds.", dumpID, [stopwatch reset]);
[stopwatch release];
OOFreePixMap(&pm);
[env release];
}
#endif
@end @end