Last commit before Git migration.

BradLarson · Jul 23, 2014 · 9562949 · 9562949
1 parent e72db48
commit 9562949
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/SLSMolecule+PDB.m b/SLSMolecule+PDB.m
@@ -769,6 +769,8 @@ - (BOOL)readFromPDBFileToDatabase:(NSError **)error;
 				}		
 				else if ([lineIdentifier isEqualToString:@"SEQRES"])
 				{
+//#warning: Fix the sequence information here, which isn't processing right
+
 					if (sequence == nil)
 					{
 						sequence = [[currentLine substringFromIndex:14] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];

diff --git a/SLSMoleculeAppDelegate.m b/SLSMoleculeAppDelegate.m
@@ -52,11 +52,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 		newSplitViewController.delegate = (SLSMoleculeiPadRootViewController *)rootViewController;
 		splitViewController = newSplitViewController;
 		[window addSubview:splitViewController.view];
+        self.window.rootViewController = splitViewController;
 	}
 	else
 	{
 		rootViewController = [[SLSMoleculeRootViewController alloc] init];
 		[window addSubview:rootViewController.view];
+        self.window.rootViewController = rootViewController;
 	}
 
 

diff --git a/SLSOpenGLES11Renderer.m b/SLSOpenGLES11Renderer.m
@@ -249,7 +249,7 @@ - (void)renderFrameForMolecule:(SLSMolecule *)molecule;
     }
 
     dispatch_async(openGLESContextQueue, ^{
-        //    CFAbsoluteTime elapsedTime, startTime = CFAbsoluteTimeGetCurrent();
+//        CFAbsoluteTime elapsedTime, startTime = CFAbsoluteTimeGetCurrent();
 
         isFrameRenderingFinished = NO;
 
@@ -291,8 +291,8 @@ - (void)renderFrameForMolecule:(SLSMolecule *)molecule;
         [self presentRenderBuffer];
         isFrameRenderingFinished = YES;
 
-        //    elapsedTime = CFAbsoluteTimeGetCurrent() - startTime;
-        //	NSLog(@"Render time: %.1f ms, Triangles per second: %.0f", elapsedTime * 1000.0, (CGFloat)totalNumberOfTriangles / elapsedTime);
+//        elapsedTime = CFAbsoluteTimeGetCurrent() - startTime;
+//        NSLog(@"Render time: %.1f ms, Triangles per second: %.0f", elapsedTime * 1000.0, (CGFloat)totalNumberOfTriangles / elapsedTime);
 
         dispatch_semaphore_signal(frameRenderingSemaphore);
     });

diff --git a/SLSOpenGLESRenderer.h b/SLSOpenGLESRenderer.h
@@ -26,7 +26,7 @@ extern NSString *const kSLSMoleculeShadowCalculationEndedNotification;
 // OpenGL helper functions
 void normalize(GLfloat *v);
 
-typedef typedef struct { 
+typedef struct { 
     GLubyte redComponent;
     GLubyte greenComponent;
     GLubyte blueComponent;

diff --git a/SLSOpenGLESRenderer.m b/SLSOpenGLESRenderer.m
@@ -388,7 +388,7 @@ - (void)bindVertexBuffersForMolecule;
             {
                 glGenBuffers(1, &atomIndexBufferHandle[currentAtomIndexBufferIndex]);
                 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, atomIndexBufferHandle[currentAtomIndexBufferIndex]);   
-                glBufferData(GL_ELEMENT_ARRAY_BUFFER, [atomIndexBuffers[currentAtomIndexBufferIndex] length], (GLushort *)[atomIndexBuffers[currentAtomIndexBufferIndex] bytes], GL_STATIC_DRAW);    
+                glBufferData(GL_ELEMENT_ARRAY_BUFFER, [atomIndexBuffers[currentAtomIndexBufferIndex] length], (GLushort *)[atomIndexBuffers[currentAtomIndexBufferIndex] bytes], GL_STATIC_DRAW);
 
                 numberOfIndicesInBuffer[currentAtomIndexBufferIndex] = ([atomIndexBuffers[currentAtomIndexBufferIndex] length] / sizeof(GLushort));
 
@@ -407,7 +407,7 @@ - (void)bindVertexBuffersForMolecule;
             {
                 glGenBuffers(1, &atomVertexBufferHandles[currentAtomVBOIndex]);
                 glBindBuffer(GL_ARRAY_BUFFER, atomVertexBufferHandles[currentAtomVBOIndex]);
-                glBufferData(GL_ARRAY_BUFFER, [atomVBOs[currentAtomVBOIndex] length], (void *)[atomVBOs[currentAtomVBOIndex] bytes], GL_STATIC_DRAW); 
+                glBufferData(GL_ARRAY_BUFFER, [atomVBOs[currentAtomVBOIndex] length], (void *)[atomVBOs[currentAtomVBOIndex] bytes], GL_STATIC_DRAW);
 
                 atomVBOs[currentAtomVBOIndex] = nil;
             }