Skip to content

Commit

Permalink
Merge branch 'analyzer-issues'
Browse files Browse the repository at this point in the history
  • Loading branch information
jobi-wan committed Oct 21, 2017
2 parents 6c8a4ca + e0f311b commit 0819f1b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions src/Cocoa/MyOpenGLView.m
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ - (id) initWithFrame:(NSRect)frameRect
}
#endif

matrixManager = [[OOOpenGLMatrixManager alloc] init];

// Pixel Format Attributes for the View-based (non-FullScreen) NSOpenGLContext
NSOpenGLPixelFormatAttribute attrs[] =
{
Expand Down Expand Up @@ -137,6 +135,7 @@ - (id) initWithFrame:(NSRect)frameRect
[self setWantsBestResolutionOpenGLSurface:YES];
}

matrixManager = [[OOOpenGLMatrixManager alloc] init];
_pixelFormatAttributes = [[NSData alloc] initWithBytes:attrs length:sizeof attrs];
virtualJoystickPosition = NSMakePoint(0.0,0.0);

Expand Down
2 changes: 0 additions & 2 deletions src/Core/Materials/OOShaderProgram.m
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,6 @@ - (id)initWithVertexShaderSource:(NSString *)vertexSource
self = [super init];
if (self == nil) OK = NO;

standardMatrixUniformLocations = nil;

if (OK && vertexSource == nil && fragmentSource == nil) OK = NO; // Must have at least one shader!

if (OK && prefixString != nil)
Expand Down
9 changes: 6 additions & 3 deletions src/Core/OOALSoundChannel.m
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ - (id) init
[self release];
self = nil;
}
// sources are all relative to listener, defaulting to zero vector
OOAL(alSourcei(_source, AL_SOURCE_RELATIVE, AL_TRUE));
OOAL(alSource3f(_source, AL_POSITION, 0.0f, 0.0f, 0.0f));
else
{
// sources are all relative to listener, defaulting to zero vector
OOAL(alSourcei(_source, AL_SOURCE_RELATIVE, AL_TRUE));
OOAL(alSource3f(_source, AL_POSITION, 0.0f, 0.0f, 0.0f));
}
}
return self;
}
Expand Down

0 comments on commit 0819f1b

Please sign in to comment.