Semicone Experiment lomanf#1

Author: lorenzo

PaperStackDemo.xcodeproj/project.xcworkspace/xcuserdata/lorenzo.xcuserdatad/UserInterfaceState.xcuserstate

@@ -10,9 +10,10 @@
  *
  */
 
-#define USE_TRIANGLE_STRIPS 1
-#define PAGE_COLUMNS        20
-#define PAGE_ROWS           25
+#define USE_TRIANGLE_STRIPS     1
+#define SHOW_DEBUG_LINES        1
+#define PAGE_COLUMNS            20
+#define PAGE_ROWS               25
 
 #define DEGREES_TO_RADIANS(__ANGLE__) ((__ANGLE__) / 180.0f * M_PI)
 #define RAD (180.0f / M_PI)

PaperStackDemo/PaperStack/CCCommon.h

@@ -57,6 +57,7 @@
   u_short    *frontStrip_;   // Index triangle strip for the front side.
   u_short    *backStrip_;    // Index triangle strip for the back side.
   u_short    stripLength_;
+    
 }
 
 @property (nonatomic) CGFloat width;  // We use standard data types to decouple our model class from the implementation details of its view.
@@ -70,6 +71,8 @@
 @property (nonatomic) CGFloat Ax;
 @property (nonatomic) CGFloat Ay;
 
+@property (nonatomic) CGPoint P;
+
 - (const Vertex2f *) textureArray;
 - (const Vertex3f *) vertices;  // Deformed page mesh as a vertex array.
 - (const u_short *) frontFaces;  // Triangle array tesselated from vertices in counter-clockwise order to represent the front face.

PaperStackDemo/PaperStack/CCPage.h

@@ -8,6 +8,8 @@
 
 
 #import "CCPage.h"
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
 
 @interface CCPage ()
 // Empty category for "private" methods
@@ -20,7 +22,7 @@ @implementation CCPage
 
 @synthesize width, height, columns, rows;
 @synthesize currentFrame, framesPerCycle;
-@synthesize rho, theta, Ax, Ay;
+@synthesize rho, theta, Ax, Ay, P;
 
 
 - (id)init
@@ -54,7 +56,6 @@ - (void)dealloc
     free(frontStrip_);
   if (backStrip_ != NULL)
     free(backStrip_);
-  
 	[super dealloc];
 }
 
@@ -126,7 +127,7 @@ - (void)createMesh
     for (iiX = 0; iiX < vCountX; iiX++)
     {
       px = (CGFloat)iiX * width / columns;
-      py = (CGFloat)iiY * height / rows;
+      py = (CGFloat)iiY * height / rows - (height*0.5);
       inputMesh_[vi].x = px;
       inputMesh_[vi].y = py;
       textureArray_[vi].x = (CGFloat)iiX / columns;
@@ -191,7 +192,7 @@ - (void)deformForTime:(CGFloat)t
 
 }
 
-- (void)deform
+- (void)deform2
 {
   // This method must be called after any values of rho, theta, or A have been changed in order to update the output geometry.
 
@@ -203,6 +204,7 @@ - (void)deform
   Vertex3f  v1;   // First stage of the deformation, with only theta and A applied. This results in a curl, but no rotation.
   Vertex3f *vo;   // Pointer to the finished vertex in the output mesh, after applying rho to v1 with a basic rotation transform.
 
+    Ay = -0.5 + fminf( 0.0, Ay );
   // Iterate over the input mesh to deform each vertex.
 	CGFloat R, r, beta, ttheta;
   for (u_short ii = 0; ii < numVertices_; ii++)
@@ -215,15 +217,16 @@ - (void)deform
           ttheta = M_PI*0.5; 
       }
     r     = R * sin(ttheta);                       // From R, calculate the radius of the cone cross section intersected by our vertex in 3D space.
-    beta  = asin((vi.x-Ax) / R) / sin(ttheta);          // Angle SCT, the angle of the cone cross section subtended by the arc |ST|.
+      
+    if ( vi.x < Ax ) 
+        beta = 0.0;
+    else
+        beta  = asin((vi.x-Ax) / R) / sin(ttheta);          // Angle SCT, the angle of the cone cross section subtended by the arc |ST|.
+      
     v1.x  = r * sin(beta) + Ax;
-      if ( vi.x <= Ax ) {
-          v1.x = v1.x;
-      }
+      if (vi.x < Ax) v1.x = vi.x;
     v1.y  = R + Ay - r * (1.0f - cos(beta)) * sin(ttheta); // *** MAGIC!!! ***
-      if ( vi.x <= Ax ) {
-          v1.y = v1.y;
-      }
+      if (vi.x < Ax) v1.y = vi.y;
     v1.z  = r * (1.0f - cos(beta)) * cos(ttheta);
 
     // Apply a basic rotation transform around the y axis to rotate the curled page. These two steps could be combined
@@ -235,6 +238,69 @@ - (void)deform
   }  
 }
 
+- (void)deform
+{    
+	CGFloat RB1, RB2, b1, b2, ipo, R, Rc, beta, ttheta;
+
+//    NSLog(@"Px: %f", P.x );
+    
+    P.y = P.y + 0.01;
+    RB2 = ( 1 + P.y ) * 0.5;
+    RB1 = 1 - RB2;
+    RB1 *= ( 1.0 - fabs( P.x ) ) * 0.5;
+    RB2 *= ( 1.0 - fabs( P.x ) ) * 0.5;
+    
+    b1 = P.x + ( RB1 * 0.5 );
+    b2 = P.x + ( RB2 * 0.5 );
+    ipo = sqrtf( pow( b1 - b2, 2 ) );
+    theta = fminf( asinf( ipo ), M_PI * 0.48 );
+    Ax = P.x * 0.5;
+    Ay = fmaxf( 1 + fminf( RB1, RB2 ) * 0.5 * ( 1 / tanf( theta ) ), 1.1 ) * ( RB1 > RB2 ? 1.0 : -1.0 );
+    
+//    NSLog(@"RB1: %f, RB2: %f", RB1, RB2 );
+//    NSLog(@"Theta: %f", theta );
+//    NSLog(@"Ay: %f", Ay );
+//    NSLog(@"Ax: %f", Ax );
+    
+    // deform mash
+    
+    Vertex2f  vi;
+    Vertex3f  v1;
+    Vertex3f *vo;
+    
+    for ( u_short ii = 0; ii < numVertices_; ii++ ) {
+        vi = inputMesh_[ ii ];
+        
+        ttheta = theta;
+        if ( vi.x < Ax ) {
+            ttheta = M_PI * 0.5;
+        }
+        
+        R = sqrt( pow( vi.x - Ax, 2.0f ) + pow( vi.y - Ay, 2.0f ) );
+        Rc = R * sin( ttheta ); 
+        beta = asin( ( vi.x - Ax ) / R ) / sin( ttheta );
+
+        // translate vertex
+        v1.x  = Rc * sin( beta ) + Ax;
+        if ( RB1 < RB2 ) {
+            v1.y  = R + Ay - Rc * ( 1.0f - cos( beta ) ) * sin( ttheta );
+        } else {
+            v1.y  = R - Ay - Rc * ( 1.0f - cos( beta ) ) * sin( ttheta );
+            v1.y  = -v1.y;
+        }
+        v1.z  = Rc * ( 1.0f - cos( beta ) ) * cos( ttheta );
+        
+        // output vertex
+        vo = &outputMesh_[ ii ];
+        //vo->x = ( v1.x * cos( rho ) - v1.z * sin( rho ) );
+        //vo->y =  v1.y;
+        //vo->z = ( v1.x * sin( rho ) + v1.z * cos( rho ) );
+        vo->x = v1.x;
+        vo->y = v1.y;
+        vo->z = v1.z;
+    }
+}
+
 #pragma mark -
 #pragma mark Private methods
 

PaperStackDemo/PaperStack/CCPage.m

@@ -52,6 +52,6 @@
 - (CCPage *)activePage;
 - (void)drawView:(id)sender;
 - (void)drawViewForTime:(CGFloat)time;
-- (void)applyTransform;
+- (void)applyTransform:(CGFloat)time;
 
 @end

PaperStackDemo/PaperStack/EAGLView.h

@@ -30,12 +30,13 @@ - (id)initWithCoder:(NSCoder*)coder
     {
         // Get the layer
         CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
-    
+            
         eaglLayer.opaque = NO;
         eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
-                                    [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
+                                    [NSNumber numberWithBool:YES], kEAGLDrawablePropertyRetainedBacking, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, nil];
 
         self.backgroundColor = [UIColor darkGrayColor];
+        
         if ( !renderer ) {
             renderer = [[ES1Renderer alloc] init];
             if (!renderer) {
@@ -61,7 +62,7 @@ - (id)initWithCoder:(NSCoder*)coder
         rightPage_ = [[CCPage alloc] init];
         rightPage_.currentFrame = 0;
         rightPage_.framesPerCycle = 120;
-        rightPage_.width = 0.75;
+        rightPage_.width = 1.0f;
         rightPage_.height = 1.0f;
         rightPage_.columns = PAGE_COLUMNS;
         rightPage_.rows = PAGE_ROWS;
@@ -88,10 +89,15 @@ - (void)drawViewForTime:(CGFloat)time
   [renderer renderObject:rightPage_];
 }
 
-- (void)applyTransform
+- (void)applyTransform:(CGFloat)time
 {
     [rightPage_ deform];
     [renderer renderObject:rightPage_];
+    
+//    CGFloat rel = ( time - 0.5 ) / 0.5;
+//    CGFloat arel = fabs( rel );
+//    CGFloat irel = ( 1.0 - arel ) * ceilf( rel );
+//    CGFloat iarel = 1.0 - arel;
 }
 
 - (void)loadTextures 
@@ -108,6 +114,11 @@ - (void)loadTextures
     rect.size.width /= tex.size.width;
     rect.size.height /= tex.size.height;
 
+    // correct width
+    rightPage_.width = ( self.superview.frame.size.width * 0.5 ) / ( self.frame.size.width * 0.5 ) * 0.5;
+    rightPage_.height = self.superview.frame.size.height / self.frame.size.height;
+    [rightPage_ createMesh];
+    
     NSLog( @"Rect -->: %f, %f, %f, %f", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height );
     [rightPage_ updateTextureCoord:rect];
 }

PaperStackDemo/PaperStack/EAGLView.m

@@ -49,7 +49,7 @@ - (void)setupView:(CAEAGLLayer *)layer
   GLfloat aspectRatio = (GLfloat)backingWidth / backingHeight;
 	glFrustumf(-size, size, -size / aspectRatio, size / aspectRatio, zNear, zFar); 
 	glViewport(0, 0, backingWidth, backingHeight);  
-    glTranslatef(0.0f, -0.5f, -90.0f);
+    glTranslatef(0.0f, -0.0f, -61.0f);
 
     glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);
@@ -149,10 +149,11 @@ - (void)renderObject:(id)obj
   glLoadIdentity();
 
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-  glClear(GL_COLOR_BUFFER_BIT);
+  glClear(GL_COLOR_BUFFER_BIT);    
 
   // Load our vertex and texture arrays. This needs to be done only once since the front and back pages share this data.
   glEnableClientState(GL_VERTEX_ARRAY);
+        
   glVertexPointer(3, GL_FLOAT, 0, vertices);
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
   glTexCoordPointer(2, GL_FLOAT, 0, textures);
@@ -182,7 +183,7 @@ - (void)renderObject:(id)obj
   glBindTexture(GL_TEXTURE_2D, texture[1]);
   glDrawElements(GL_TRIANGLES, numFaces * 3, GL_UNSIGNED_SHORT, backFaces);
 #endif
-  
+    
   // This application only creates a single color renderbuffer which is already bound at this point.
   // This call is redundant, but needed if dealing with multiple renderbuffers.
   glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderbuffer);

PaperStackDemo/PaperStack/ES1Renderer.m

@@ -18,7 +18,6 @@ @interface PSPlayerController()
 @property (nonatomic, retain) PSPageView *pageRight;
 
 // drawing elements
-@property (nonatomic, assign) UIView *apex;
 
 - (void)deviceDidRotate;
 - (void)pageCurlWithPoint:(CGPoint)point;
@@ -29,7 +28,6 @@ @implementation PSPlayerController
 
 @synthesize landscapeMode, pageTarget, pageLeft, pageRight;
 @synthesize glView;
-@synthesize apex;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -97,12 +95,6 @@ - (void)viewDidLoad
 
     [self.view bringSubviewToFront:glView];
 
-    // drawing elements
-    UIView *a = [[UIView alloc] initWithFrame:CGRectMake( 0, 0, 5, 5 )];
-    a.backgroundColor = [UIColor redColor];
-    [self.view addSubview:a];
-    self.apex = a;
-    [a release];
 }
 
 - (void)viewDidUnload
@@ -180,24 +172,26 @@ - (CGRect)rendererGetBackTextureRect
 - (void)pageCurlWithPoint:(CGPoint)point
 {
     CGRect rect = self.view.frame;
-    CGFloat half = rect.size.width * 0.5;
-    CGFloat dx = ( point.x - half ) / half; 
-    CGFloat dy = point.y / rect.size.height; 
-    
-    CGFloat aX = dx;
-    CGFloat aY = -dy * 1.5;
-    
-    apex.center = CGPointMake( half + aX * half, 10 );
-    [self.view bringSubviewToFront:apex];
-    
+    CGFloat halfw = rect.size.width * 0.5;
+    CGFloat halfh = rect.size.height * 0.5;
+    CGFloat dx = ( point.x - halfw ) / halfw; 
+    CGFloat dy = ( point.y - halfh ) / halfh; 
+    
+    CGFloat pX = dx;
+    CGFloat pY = -dy;
+   
+    /*
     CCPage *page = [glView activePage];
     page.Ax = aX;
     page.Ay = aY;
     page.rho = 0.0;
-    page.theta = 0.12;
-  
+    page.theta = 0.3;
+    */
+    
+    CCPage *page = [glView activePage];
+    page.P = CGPointMake( pX, pY );
 
-    [glView applyTransform];
+    [glView applyTransform:(point.x/rect.size.width)];
 }
 
 #pragma mark -

PaperStackDemo/PaperStack/PSPlayerController.m

@@ -172,17 +172,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">EAGLView</string>
 					<string key="superclassName">UIView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">animationTime</string>
-						<string key="NS.object.0">CGFloat</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">animationTime</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">animationTime</string>
-							<string key="candidateClassName">CGFloat</string>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/EAGLView.h</string>