RSS

(root)/iphone/common : 57 : MarineCompass/source/EAGLView.m

To get this branch, use:
bzr branch /browse/iphone/common

« back to all changes in this revision

Viewing changes to MarineCompass/source/EAGLView.m

Dömötör Gulyás
2009-11-17 20:42:17
Revision ID: dognotdog@gmail.com-20091117194217-4m19mdzncyl0r3ob
closes bottom of compass with disk; update for using Tappity

Show diffs side-by-side

added added

removed removed

MarineCompass/source/EAGLView.m
61
61
        [self loadTextureFromBitmapNamed: @"scale2.1024.png" texName: &scale2tex repeat: NO mipmap: NO filter: YES];
62
62
        [self loadTextureFromBitmapNamed: @"lines.1024.png" texName: &linesTex repeat: NO mipmap: NO filter: YES];
63
63
        [self loadTextureFromBitmapNamed: @"disk1.png" texName: &disk1tex repeat: NO mipmap: NO filter: YES];
 
64
        [self loadTextureFromBitmapNamed: @"disk2.png" texName: &disk2tex repeat: NO mipmap: NO filter: YES];
64
65
        [self loadTextureFromBitmapNamed: @"white.png" texName: &whiteTex repeat: NO mipmap: NO filter: NO];
65
66
        [self loadTextureFromBitmapNamed: @"gray.png" texName: &grayTex repeat: NO mipmap: NO filter: NO];
66
67
 
237
238
                [simpleShader setTextureMatrix: &I];
238
239
                
239
240
                [[VertexArray sharedDisk] draw];
 
241
                
 
242
                glBindTexture(GL_TEXTURE_2D, disk2tex);
 
243
                m16 diskFrame2 = mmul(compassFrame, mmul(mtranslate(vcreate(0.0,0.0,-0.2)), mscale(vcreate(1.0,1.0,1.0))));
 
244
                [simpleShader setModelviewMatrix: &diskFrame2];
 
245
                [[VertexArray sharedDisk] draw];
 
246
                
240
247
                                
241
248
                glBindTexture(GL_TEXTURE_2D, scale2tex);
242
249
                

Loggerhead 1.17 is a web-based interface for Bazaar branches