Project

General

Profile

« Previous | Next » 

Revision 77d3e4f6

Added by Leszek Koltunski over 3 years ago

Switch Rubik Control off for the moment.

View differences:

src/main/java/org/distorted/helpers/FactoryCubit.java
631 631
        center.set( centers[cent][0], centers[cent][1], centers[cent][2]);
632 632

  
633 633
        int corn = cornerIndexes[v];
634
        float strength = corners[corn][0];
635
        float radius   = corners[corn][1];
636 634

  
637
        roundCorners(mesh, center, staticVert, strength, radius);
635
        if( corn>=0 )
636
          {
637
          float strength = corners[corn][0];
638
          float radius   = corners[corn][1];
639
          roundCorners(mesh, center, staticVert, strength, radius);
640
          }
638 641
        }
639 642
      }
640 643
    }
src/main/java/org/distorted/screens/RubikScreenPlay.java
54 54

  
55 55
  private static final int[] BUTTON_LABELS = { R.string.scores,
56 56
                                               R.string.patterns,
57
                                               R.string.control,
57
                                           //    R.string.control,
58 58
                                               R.string.solver,
59 59
                                               R.string.tutorials,
60 60
                                               R.string.about };
......
394 394
              pDiag.setArguments(pBundle);
395 395
              pDiag.show( act.getSupportFragmentManager(), RubikDialogPattern.getDialogTag() );
396 396
              break;
397
/*
397 398
      case 2: RubikControl control = RubikControl.getInstance();
398 399
              control.animateAll(act);
399 400
              break;
400
      case 3: ScreenList.switchScreen(act, ScreenList.SVER);
401
*/
402
      case 2: ScreenList.switchScreen(act, ScreenList.SVER);
401 403
              break;
402
      case 4: RubikDialogTutorial tDiag = new RubikDialogTutorial();
404
      case 3: RubikDialogTutorial tDiag = new RubikDialogTutorial();
403 405
              Bundle tBundle = new Bundle();
404 406
              int tOrd = getTutorialOrdinal();
405 407
              tBundle.putInt("tab", tOrd );
406 408
              tDiag.setArguments(tBundle);
407 409
              tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );
408 410
              break;
409
      case 5: RubikDialogAbout aDiag = new RubikDialogAbout();
411
      case 4: RubikDialogAbout aDiag = new RubikDialogAbout();
410 412
              aDiag.show(act.getSupportFragmentManager(), null);
411 413
              break;
412 414
      }

Also available in: Unified diff