Project

General

Profile

« Previous | Next » 

Revision eaf57f1c

Added by Leszek Koltunski almost 5 years ago

Modify the 'convexity' param in Dynamics.

This finally satisfies the requirements of the 'Spin' effect in MagicCube: achieving constant speed ( by setting a 1D Dynamic's convexity to 0)

View differences:

src/main/java/org/distorted/library/type/Dynamic2D.java
59 59
60 60 
      if( q>1 )
61 61 
        {
62 
        tmp1.tangent[0] = mConvexity*(nx+px/q);
63 
        tmp1.tangent[1] = mConvexity*(ny+py/q);
62 
        tmp1.tangent[0] = nx+px/q;
63 
        tmp1.tangent[1] = ny+py/q;
64 64 
        }
65 65 
      else
66 66 
        {
67 
        tmp1.tangent[0] = mConvexity*(px+nx*q);
68 
        tmp1.tangent[1] = mConvexity*(py+ny*q);
67 
        tmp1.tangent[0] = px+nx*q;
68 
        tmp1.tangent[1] = py+ny*q;
69 69 
        }
70 70 
      }
71 71 
    else
......
129 129 
        tmp1.cached[0] = curr.x;
130 130 
        tmp1.cached[1] = curr.y;
131 131 

  		




  132
  
  
    
        tmp1.a[0] =  2*curr.x +   tmp1.tangent[0] - 2*next.x + tmp2.tangent[0];


  		




  133
  
  
    
        tmp1.b[0] = -3*curr.x - 2*tmp1.tangent[0] + 3*next.x - tmp2.tangent[0];


  		




  134
  
  
    
        tmp1.c[0] = tmp1.tangent[0];


  		




  
  132
  
    
        tmp1.a[0] = mConvexity*( 2*curr.x +   tmp1.tangent[0] - 2*next.x + tmp2.tangent[0]);


  		




  
  133
  
    
        tmp1.b[0] = mConvexity*(-3*curr.x - 2*tmp1.tangent[0] + 3*next.x - tmp2.tangent[0]);


  		




  
  134
  
    
        tmp1.c[0] = mConvexity*(tmp1.tangent[0]) + (1.0f-mConvexity)*(next.x-curr.x);


  		




  135
  135
  
    
        tmp1.d[0] = curr.x;


  		




  136
  136
  
    

  		




  137
  
  
    
        tmp1.a[1] =  2*curr.y +   tmp1.tangent[1] - 2*next.y + tmp2.tangent[1];


  		




  138
  
  
    
        tmp1.b[1] = -3*curr.y - 2*tmp1.tangent[1] + 3*next.y - tmp2.tangent[1];


  		




  139
  
  
    
        tmp1.c[1] = tmp1.tangent[1];


  		




  
  137
  
    
        tmp1.a[1] = mConvexity*( 2*curr.y +   tmp1.tangent[1] - 2*next.y + tmp2.tangent[1]);


  		




  
  138
  
    
        tmp1.b[1] = mConvexity*(-3*curr.y - 2*tmp1.tangent[1] + 3*next.y - tmp2.tangent[1]);


  		




  
  139
  
    
        tmp1.c[1] = mConvexity*(tmp1.tangent[1]) + (1.0f-mConvexity)*(next.y-curr.y);


  		




  140
  140
  
    
        tmp1.d[1] = curr.y;


  		




  141
  141
  
    
        }


  		




  142
  142
  
    
      }


  		












Also available in:  Unified diff