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

Added uniform types for random numbers, vectors and quaternions.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1773 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2008-09-28 17:39:49 +00:00
parent 5e8da50afc
commit 47563b5518
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Core/Materials/OOShaderMaterial.m
View File

@ -325,6 +325,7 @@ static NSString *MacrosToString(NSDictionary *macros);
SEL selector = NULL; SEL selector = NULL;
OOUniformConvertOptions convertOptions; OOUniformConvertOptions convertOptions;
BOOL quatAsMatrix = YES; BOOL quatAsMatrix = YES;
GLfloat scale = 1.0;
for (uniformEnum = [uniformDefs keyEnumerator]; (name = [uniformEnum nextObject]); ) for (uniformEnum = [uniformDefs keyEnumerator]; (name = [uniformEnum nextObject]); )
{ {
@ -341,6 +342,7 @@ static NSString *MacrosToString(NSDictionary *macros);
value = [(NSDictionary *)definition objectForKey:@"value"]; value = [(NSDictionary *)definition objectForKey:@"value"];
binding = [(NSDictionary *)definition stringForKey:@"binding"]; binding = [(NSDictionary *)definition stringForKey:@"binding"];
type = [(NSDictionary *)definition stringForKey:@"type"]; type = [(NSDictionary *)definition stringForKey:@"type"];
scale = [(NSDictionary *)definition floatForKey:@"scale" defaultValue:1.0];
if (type == nil) if (type == nil)
{ {
if (value == nil && binding != nil) type = @"binding"; if (value == nil && binding != nil) type = @"binding";
@ -357,6 +359,38 @@ static NSString *MacrosToString(NSDictionary *macros);
binding = definition; binding = definition;
type = @"binding"; type = @"binding";
} }
else if ([definition isKindOfClass:[NSArray class]])
{
binding = definition;
type = @"vector";
}
// Transform random values to concrete values
if ([type isEqualToString:@"randomFloat"])
{
type = @"float";
value = [NSNumber numberWithFloat:randf() * scale];
}
else if ([type isEqualToString:@"randomUnitVector"])
{
type = @"vector";
value = OOPropertyListFromVector(vector_multiply_scalar(OORandomUnitVector(), scale));
}
else if ([type isEqualToString:@"randomVectorSpatial"])
{
type = @"vector";
value = OOPropertyListFromVector(OOVectorRandomSpatial(scale));
}
else if ([type isEqualToString:@"randomVectorRadial"])
{
type = @"vector";
value = OOPropertyListFromVector(OOVectorRandomRadial(scale));
}
else if ([type isEqualToString:@"randomQuaternion"])
{
type = @"quaternion";
value = OOPropertyListFromQuaternion(OORandomQuaternion());
}
if ([type isEqualToString:@"float"] || [type isEqualToString:@"real"]) if ([type isEqualToString:@"float"] || [type isEqualToString:@"real"])
{ {