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

Reinstated planet texture source tracking.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3498 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-06-11 12:17:57 +00:00
parent 5e82f1d8e5
commit 2516df1080
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Entities/PlanetEntity.h
View File

@ -60,7 +60,7 @@ typedef struct
int r_seed[MAX_VERTICES_PER_ENTITY];
GLuint displayListNames[MAX_SUBDIVIDE];
BOOL isTextureImage; // is the texture a png image (as opposed to synthesized)?
BOOL isTextureImage; // is the texture explicitly specified (as opposed to synthesized)?
NSString *_textureFileName;
OOTexture *_texture;

4
src/Core/Entities/PlanetEntity.m
View File

@ -205,6 +205,7 @@ static int baseVertexIndexForEdge(int va, int vb, BOOL textured);
_texture = [self cloudTextureWithCloudColor:cloudColor cloudImpress:cloud_impress cloudBias:cloud_bias];
[_texture retain];
isTextureImage = NO;
setRandomSeed(saved_seed);
RANROTSetFullSeed(ranrotSavedSeed);
@ -533,6 +534,7 @@ static int baseVertexIndexForEdge(int va, int vb, BOOL textured);
if (procGen && _texture == nil)
{
_texture = [self planetTextureWithInfo:planetInfo];
isTextureImage = NO;
[_texture retain];
}
#endif
@ -1460,6 +1462,8 @@ static int baseVertexIndexForEdge(int va, int vb, BOOL textured)
[_textureFileName release];
_textureFileName = [[configuration oo_stringForKey:@"name"] copy];
isTextureImage = YES;
}