Project

General

Profile

Statistics
| Branch: | Tag: | Revision:

magiccube / src / main @ 97193a09

# Date Author Comment
97193a09 10/13/2021 06:59 PM Leszek Koltunski

Bump versionCode to 42 (forgotten before)

772882ec 10/13/2021 05:36 PM Leszek Koltunski

Fix a lint error.

4c9947bd 10/13/2021 04:14 PM Leszek Koltunski

1. Do not restore object scrambling if we freshly upgraded from some version older than 1.9.0
2. Bugfix for a recently introduced crasher in the Play screen.

59553a2a 10/13/2021 03:02 PM Leszek Koltunski

Tutorials

2da68298 10/13/2021 01:59 PM Leszek Koltunski

Create the 3 Popups only on first button click - this time we can have the final screen dimensions (and also it starts faster ) Before we weree getting the screen size from before hiding navigation bars, which made the height smaller, which made the number of obejcts and levels in the popups sometimes too small!

7b2a8ef3 10/12/2021 12:28 PM Leszek Koltunski

Progress with cuboids.

fbffa02a 10/11/2021 11:47 PM Leszek Koltunski

Fix the Solver

09b2bd31 10/11/2021 10:53 PM Leszek Koltunski

make numLayers into an int[] (preparation for Cuboids)
Caution: because of previous changes to cubit order in cube, the Solver is broken!

8c93c0b1 10/11/2021 12:24 AM Leszek Koltunski

'IconMode' finished.

f08ec48e 10/06/2021 11:40 PM Leszek Koltunski

Remove unneeded API.

0c52f5da 10/06/2021 11:25 PM Leszek Koltunski

Relax objectlib's requirements: it can be displayed not only on top of a DistortedScreen, but any DistortedFramebuffer.

52547ba7 10/06/2021 01:15 PM Leszek Koltunski

Simplification

eb49fa90 10/06/2021 01:04 AM Leszek Koltunski

Use the off-center objects to display the object in Tutorial mode properly.
Now it is not covered by the right bar!

33f6abfd 10/05/2021 10:53 PM Leszek Koltunski

Remove the 'setupObject()' redundant API.

f57d0ad9 10/05/2021 07:10 PM Leszek Koltunski

Minor

c65a5efe 10/05/2021 03:40 PM Leszek Koltunski

Further simplifications.

e019c70b 10/05/2021 03:12 PM Leszek Koltunski

Remove the concept of a 'TwistyActivity' altogether.

9523ae28 10/05/2021 02:12 PM Leszek Koltunski

Hide most of the TwistyActivity methods inside objectlib.

f4f784ad 10/05/2021 12:58 PM Leszek Koltunski

Bugfix: we shouldn't be calling TwsityObject.solve() directly from the app, only through ObjectControl.solveOnly().

e4f656d1 10/05/2021 12:52 PM Leszek Koltunski

Simplifications

2afc6754 10/05/2021 11:58 AM Leszek Koltunski

Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.

8ab435b9 10/04/2021 10:11 PM Leszek Koltunski

1. Remove 'db level' from objectlib (this belongs to the app!)
2. change ScreenPlay's 'mObject' to be an ObjectType.

287e91a6 10/04/2021 04:59 PM Leszek Koltunski

Remove from ObjectType info which row given object is supposed to be in. This belongs to the applcations.

1bafcba4 10/04/2021 03:33 PM Leszek Koltunski

Simplifications

05a244ad 10/04/2021 03:23 PM Leszek Koltunski

Simplifications

05c20dad 10/04/2021 02:17 PM Leszek Koltunski

Simplifications

dd1a65c1 10/04/2021 01:39 PM Leszek Koltunski

Move ObjectControl, the next big chunk of code, to objectlib.

eaf46415 10/02/2021 12:07 PM Leszek Koltunski

Move PreRender to objectlib.
This code is now shared betweeen the Rubik and Tutorial activities.

1cd323dd 10/02/2021 12:08 AM Leszek Koltunski

Move yet more code to objectlib.
It's almost possible to move the PreRender to objectlib now.

d2556e79 10/01/2021 11:31 PM Leszek Koltunski

Move yet more code to objectlib.

88a3e972 10/01/2021 11:27 PM Leszek Koltunski

Move more code to objectlib.

c4175d85 10/01/2021 10:33 PM Leszek Koltunski

Simplify TwistyObject's API.

e8205412 10/01/2021 10:12 PM Leszek Koltunski

Simplify TwistyObject's API.

9333086d 10/01/2021 10:01 PM Leszek Koltunski

Correct a recently introduced bug with restoring records.
Slightely simplify ObjectType.

318c0a7d 10/01/2021 04:33 PM Leszek Koltunski

Reename ObjectList to a more logical ObjectType.

7ac0ee88 10/01/2021 04:31 PM Leszek Koltunski

Simplify ObjectList: now there's just one object per size.

fdb5f389 09/30/2021 04:14 PM Leszek Koltunski

Simplify objectlib's API.
Correct a recently introduced bug with resetting texture maps.

b6dcb62b 09/30/2021 04:03 PM Leszek Koltunski

Move QuatHelpeer to distorted-library

c4b665bf 09/29/2021 10:16 PM Leszek Koltunski

Remove all the flags - those are now in a separate module

c93c6264 09/29/2021 09:49 PM Leszek Koltunski

add two missing files

3f7a4363 09/29/2021 04:07 PM Leszek Koltunski

Remove all files that have been separated into a new library 'objectlib'

588ace55 09/29/2021 12:14 PM Leszek Koltunski

Prepare the 'objectlib' package to be separated into a library module

e01c0d02 09/29/2021 10:10 AM Leszek Koltunski

Rename some assets for consistency

bdbbb4c5 09/28/2021 11:47 PM Leszek Koltunski

Refactoring: split the 'objects' package into two, 'objects' and 'objectlib'.
The point: we're going to need to move the 'objectlib' stuff into its own library module, and that's because we're going to create a new app module which needs access to it.

d13df23d 09/27/2021 04:02 PM Leszek Koltunski

Important bugfix.

7ee89540 09/26/2021 10:12 PM Leszek Koltunski

Remove redundant variable.

967c1d17 09/25/2021 01:30 AM Leszek Koltunski

Do away with the last method in the object Movement classes. Remove the object Movement classes altogether.
From now on the implementation of a TwistyPuzzle is 100% data, no code at all.
Next step: make the implementation a (generated?) (XML?) file.

74c9af0d 09/24/2021 05:27 PM Leszek Koltunski

Next step on the way to completely do away with object Movement classes.

a76d9cb4 09/24/2021 04:23 PM Leszek Koltunski

Correct the cuts of Mega/Kilominx.

4946b635 09/24/2021 11:30 AM Leszek Koltunski

Major abstraction - automatically compute the 'computeRowFromOffset()' function from CUTS.
Still one thing left: it appears like the CUTS of Mega/Kilominxes are not correct.

ef018c1b 09/23/2021 02:11 AM Leszek Koltunski

Abstract the next function, computeRowFromOffset(), out of the individual Movement classes.
Still two issues:

1) mysterious 1.5 multiplier in Movement12
2) in Movement8, moving the offset works only if the rotAxis are face-turning, i.e. they connect the centers of the opposing faces of the octahedron.

4ab3d91b 09/21/2021 02:15 AM Leszek Koltunski

Remove class referencees from ObjectList.

96208efc 09/21/2021 01:50 AM Leszek Koltunski

MOve the FOV from ObjectList to individual object classes.

efa81f0c 09/21/2021 01:43 AM Leszek Koltunski

Introduce abstract 4,6,8 adn 12 classes.

e9a87113 09/21/2021 12:59 AM Leszek Koltunski

Move the Movement class from ObjectList to individual object classes.

e782e026 09/21/2021 12:37 AM Leszek Koltunski

Realize that the Movements of Rex, Redi, Dino and the Skewbs are all identical and convert those 4 classes into one MovementCornerTwisting.

5da517d3 09/19/2021 01:04 PM Leszek Koltunski

Minor

da178c88 09/19/2021 12:44 AM Leszek Koltunski

Make computing the offset in the Movement class more correct. From now on, in the center of the face the offset if always 0 regardless of the axis.
Before it would always assume that we can add DIST2D to the offset which is originated at the center of the face and this way get an offset which spans from 0 to height of the face. This is not always true - conterexample: half of the triangluar faces of an octahedron which are 'upside down'

771f6dfa 09/18/2021 10:09 PM Leszek Koltunski

Move actual solving the object to PreRender.

(before we had a 'solveObejct()' in preRender already, but that one just starts the Solve Effect!)

df664009 09/18/2021 08:40 PM Leszek Koltunski

Minor

5b05d357 09/17/2021 04:10 PM Leszek Koltunski

Minor

c7a98f94 09/17/2021 03:57 PM Leszek Koltunski

Minor

be7c9190 09/17/2021 03:51 PM Leszek Koltunski

Abstract out some methods from the Movement classes. only two remain now: rowFromOffset and enabledAxis.

387b6326 09/17/2021 12:01 PM Leszek Koltunski

Make the Kilo and Megaminxes standard size (dodecahedron size=3,5, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

1b32d001 09/16/2021 12:27 AM Leszek Koltunski

Make the Ultimate standard size (dodecahedron size=2, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

74d67e50 09/16/2021 12:00 AM Leszek Koltunski

Make the Skewbs standard size (cube size=2,3, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

16861599 09/15/2021 11:24 PM Leszek Koltunski

Make Rex standard size (cube size=3, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

d84768fe 09/15/2021 06:41 PM Leszek Koltunski

Make Jing standard size (tetra size=2, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

4d27a99b 09/15/2021 01:48 PM Leszek Koltunski

Make Ivy standard size (cube size=2, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

41c8d4d8 09/15/2021 01:34 PM Leszek Koltunski

Make Helicopter standard size (cube size=3, i.e. equal to numLayers so that DIST2D and DIST3D are standard)

7e338611 09/15/2021 10:37 AM Leszek Koltunski

On second thought, come back to Vector. The problem: before we had the potentially blocking function 'effectFinished' inside our synchronized block.

4c49986e 09/14/2021 11:55 PM Leszek Koltunski

1) add missing call to BlockController.onPause() / onResume() to the Tutorial activity
2) rearrange BlockController's error reporting to make the case where the MessageSender thread has died separate
3) in such case, resurrect the thread
4) simplify and harden the EffectMessageSender

de43f86a 09/14/2021 03:32 PM Leszek Koltunski

Correct height of the tutorial dialog.

1160205e 09/13/2021 01:39 PM Leszek Koltunski

Add Mirror 2x2 tutorials.

3e6b6e37 09/13/2021 01:07 PM Leszek Koltunski

Increase NODE_RATIO, i.e. the height/width ratio of the DistortedNode behind the object (before with 1.4, if one scrambled the Mirror Cube and made it the largest possible, corners were cut off form the top and bottom)

0e505360 09/13/2021 01:00 PM Leszek Koltunski

Mirror Cubes: re-enable meshes; update meshes.

62ec404d 09/13/2021 12:55 PM Leszek Koltunski

Mirror Cubes: make them still more off-center.

69f807c5 09/13/2021 03:53 AM Leszek Koltunski

Mirror Cubes: make them a bit more off-center.

36341b2f 09/13/2021 03:45 AM Leszek Koltunski

Mirror Cubes: add meshes and icons.

abf36986 09/13/2021 03:15 AM Leszek Koltunski

Add Mirror Cube 2x2 and 3x3.

91792184 09/10/2021 01:29 AM Leszek Koltunski

Make object scrambling abstract (well, almost - with exception of Square-1 - this theoretically could also be done the generic way, but this would require almost 20000 'ScrambleStates')

f5e7bb94 09/09/2021 11:56 PM Leszek Koltunski

Some more debugs for the case when the UI is blocked.

00aa398a 09/09/2021 11:24 PM Leszek Koltunski

safety!

255492a0 09/09/2021 11:21 PM Leszek Koltunski

Improvements for the PopupWindows: now they work:

1) on Android 11, everywhere
2) on Android 10,9,8.1,8.0 - in case of fullscreen and split-screen modes; pop-up mode still does not work.
3) on Android <= 7.0 : there should be no pop-up mode, so they should be working in all cases

a36b9dca 09/07/2021 11:27 PM Leszek Koltunski

Defer initialization of statics in RubikNetwork till we actually need them.

cc3d81dd 09/07/2021 11:11 PM Leszek Koltunski

Remove statics from the TwistyObject class.

dc78f395 09/07/2021 02:34 PM Leszek Koltunski

Fix play screen popups in case the whole app is in 'multi-window' or 'pop-up window' state.

51baad0e 09/07/2021 01:08 PM Leszek Koltunski

Simplify Play Screen popups.

d90c55cc 09/07/2021 01:00 PM Leszek Koltunski

Make the 'Play' popup always fit within the window height.

963921af 09/07/2021 02:17 AM Leszek Koltunski

Remove statics from the Ultimate class.

d5380277 09/07/2021 02:06 AM Leszek Koltunski

Remove statics from the Square classes.

8c3148e2 09/07/2021 01:25 AM Leszek Koltunski

Remove statics from the Skewb class.

f242ba04 09/07/2021 01:09 AM Leszek Koltunski

Remove statics from the Rex class.

1dd8d3af 09/07/2021 01:02 AM Leszek Koltunski

Remove statics from the Redi class.

48fec01e 09/07/2021 12:48 AM Leszek Koltunski

Remove statics from the Pyraminx class.

af0de0af 09/07/2021 12:38 AM Leszek Koltunski

Remove statics from the Minx classes.

4f8cda80 09/06/2021 11:45 PM Leszek Koltunski

Remove statics from the Jing class.

e01fa67a 09/06/2021 11:20 PM Leszek Koltunski

Remove statics from the Ivy class.

85449b44 09/06/2021 11:12 PM Leszek Koltunski

Remove statics from the Helicopter class.

d464f54f 09/06/2021 10:56 PM Leszek Koltunski

Remove statics from the Dino classes.