Project

General

Profile

Statistics
| Branch: | Revision:

distorted-objectlib / src / main / java @ c046eceb

# Date Author Comment
c046eceb 02/15/2025 02:03 PM Leszek Koltunski

minor

3f3c1bff 02/15/2025 02:02 PM Leszek Koltunski

beginnings of abstract TwistyGhost

3833fe76 02/15/2025 11:46 AM Leszek Koltunski

fix fastScrambling

b23a5775 02/15/2025 10:40 AM Leszek Koltunski

consolidate TouchControl

61f305b0 02/15/2025 10:01 AM Leszek Koltunski

bugfix for scrambling GhostCubes

9e3d5d0a 02/15/2025 09:53 AM Leszek Koltunski

bugfix for scrambling GhostCubes

437bbaea 02/15/2025 09:34 AM Leszek Koltunski

bugfix for GhostCube; jsons and meshes for Ghost 2x2 and 3x3.

9c8d4a58 02/14/2025 01:08 PM Leszek Koltunski

bugfix for GhostCube

8060c75a 02/14/2025 12:43 PM Leszek Koltunski

bugfix for GhostCube

6cd11cb8 02/14/2025 01:21 AM Leszek Koltunski

progress with GhostCube

94e59a5b 02/13/2025 08:52 PM Leszek Koltunski

debugging GhostCubes

ec4b9bfa 02/12/2025 05:05 PM Leszek Koltunski

progress with GhostCubes

08fa3eb0 02/12/2025 12:27 AM Leszek Koltunski

progress with GhostCube

91eb2d45 02/11/2025 11:44 PM Leszek Koltunski

progress with GhostCube

031949ea 02/11/2025 06:37 PM Leszek Koltunski

bugfixes

0875ca3b 02/11/2025 06:21 PM Leszek Koltunski

Merge remote-tracking branch 'origin/master'

  1. Conflicts:
  2. src/main/java/org/distorted/objectlib/metadata/ListObjects.java
  3. src/main/java/org/distorted/objectlib/metadata/MetadataGHOS_2.java
  4. src/main/java/org/distorted/objectlib/objects/TwistyGhostCube.java
43120806 02/11/2025 04:39 PM Leszek Koltunski

progress with GhostCubes

29e080fc 02/02/2025 11:43 AM Leszek Koltunski

Beginnings of generic TwistyGhostCube class.

e4b1bbc5 02/01/2025 03:13 PM Leszek Koltunski

minor

66747cd3 02/01/2025 01:59 PM Leszek Koltunski

Scrambling ghosts done

5ba7d3f2 02/01/2025 10:40 AM Leszek Koltunski

backing ghost moves works now.

0d23a827 02/01/2025 10:31 AM Leszek Koltunski

start using the new (axis,rowBitmap,degrees) format in JSONs and up their version to 17.

44970637 02/01/2025 12:39 AM Leszek Koltunski

change format of ObjectMove from (axis,rowBitmap,bareAngle) to (axis,rowBitmap,angleInDegrees)

dc4c8c5e 01/31/2025 12:37 PM Leszek Koltunski

fix scrambling shapeshifting cuboids.

495463cc 01/31/2025 11:49 AM Leszek Koltunski

improvements to the API

ae290deb 01/31/2025 01:50 AM Leszek Koltunski

improvements to the API

c2caaa88 01/31/2025 12:14 AM Leszek Koltunski

further bugfix for a crasher

0f746c5e 01/31/2025 12:08 AM Leszek Koltunski

further bugfix for a crasher

30392d2e 01/30/2025 10:49 PM Leszek Koltunski

further bugfix for a crasher

da39b01d 01/30/2025 10:34 PM Leszek Koltunski

progress

a2ca5c02 01/30/2025 10:20 PM Leszek Koltunski

progress

74fe014e 01/30/2025 05:56 PM Leszek Koltunski

fix for a crasher

84adb9f4 01/30/2025 03:50 PM Leszek Koltunski

further fixes for crashers

64c7c06b 01/30/2025 02:26 PM Leszek Koltunski

several fixes for crashers

813a8782 01/30/2025 01:12 PM Leszek Koltunski

compiles now

76762fba 01/29/2025 11:13 PM Leszek Koltunski

progress

3fda3a94 01/29/2025 04:40 PM Leszek Koltunski

progress

baf80e60 01/28/2025 05:14 PM Leszek Koltunski

ObjectMove

ea164b48 01/28/2025 12:42 PM Leszek Koltunski

minor

34f3fcf6 01/28/2025 01:16 AM Leszek Koltunski

minor

a8e63135 01/27/2025 10:53 PM Leszek Koltunski

next fix for ghosts

ca9dd293 01/27/2025 01:10 AM Leszek Koltunski

further fixes for ghosts

4b4a90ff 01/26/2025 02:51 PM Leszek Koltunski

further fixes for ghosts

a5d2417a 01/26/2025 12:44 PM Leszek Koltunski

This time it really looks like the Ghost model is finally correct, and the 2x2, 4x2 and 6x2 Ghosts do work (except automatic moves and possibly backing ghost moves)

8439f1dd 01/23/2025 11:17 PM Leszek Koltunski

Ghost....

3cba0dfb 01/21/2025 12:54 AM Leszek Koltunski

minor

434c8de8 01/21/2025 12:41 AM Leszek Koltunski

completely separate out the Ghost part of the puzzle to its own class, TwistyObjectGhost.

ef56782c 01/20/2025 11:15 PM Leszek Koltunski

move alll ghostStuff to TwistyObjectControllable

3822d819 01/19/2025 12:07 PM Leszek Koltunski

progress with Ghosts. Still far off...

db19251c 01/17/2025 03:28 PM Leszek Koltunski

another fix for the automatic rotations of Ghosts.

We still seem to be sometimes losing the correct mGhostAxis during automatic rotations.

910010c3 01/17/2025 03:12 PM Leszek Koltunski

partial fix for the automatic rotations of Ghosts.

2946f04a 01/17/2025 02:45 PM Leszek Koltunski

unify test ghost classes into one

70087102 01/17/2025 12:29 PM Leszek Koltunski

first part to support auto-rotations of Ghosts.

d1969fc4 01/17/2025 11:44 AM Leszek Koltunski

Ghost part of the puzzle is now properly saved/restored

0fbf344e 01/17/2025 02:32 AM Leszek Koltunski

All manual control over 4x2x2 and 2x2x2 Ghosts should be working now. Remaining:

- automatic moves (forcing the initial unblocking)
- remembering the state of a ghost

052a86d5 01/17/2025 01:00 AM Leszek Koltunski

progress with 2x2x2 Ghost. Almost good now!

fe51552f 01/16/2025 03:54 PM Leszek Koltunski

progress with 2x2x2 Ghost

676dcc68 01/16/2025 01:44 PM Leszek Koltunski

progress with generic ghostAxis switching.
Proper Solve() including Ghost stuff.

9211c7d8 01/16/2025 01:16 AM Leszek Koltunski

progress with generic ghostAxis switching.

a23e35db 01/15/2025 11:12 PM Leszek Koltunski

implement correct TouchControlShapeChanging for Ghosts - taking into account the Ghost rotation (part2).

765c7c75 01/15/2025 11:09 PM Leszek Koltunski

implement correct TouchControlShapeChanging for Ghosts - taking into account the Ghost rotation.

b0393ca5 01/15/2025 03:03 PM Leszek Koltunski

minor

4ca090ed 01/15/2025 11:12 AM Leszek Koltunski

unify TouchControl

6b2f62c9 01/15/2025 10:41 AM Leszek Koltunski

unify TouchControl

37857f92 01/15/2025 09:36 AM Leszek Koltunski

Basic manual contorl over a 4x2x2 Ghost should be fine now.

Things still TODO:

1) correct axis in TouchControl when all rows are 'down'
2) implement proper ghostAxis and rowBitmap switching that would work in general, not only in case of a 4x2x2
3) implement automatic rotation that would force unblocking on the first move

2ff44228 01/14/2025 10:45 PM Leszek Koltunski

Big progress with Ghosts.

The test (4,2,2) almost works now - only sometimes, when we switch to mGhostRowBitmap=fullOnes, (all rows 'DOWN' ) then some cubits do not seem to belong to their assigned layers anymore.

10e7006d 01/14/2025 04:33 PM Leszek Koltunski

Big progress with Ghosts.

The test (4,2,2) almost works now - only sometimes, when we switch to mGhostRowBitmap=fullOnes, (all rows 'DOWN' ) then some cubits do not seem to belong to their assigned layers anymore.

a332f7a4 01/14/2025 03:24 PM Leszek Koltunski

progress with Ghosts

c0a19d83 01/12/2025 11:54 PM Leszek Koltunski

Work on Ghosts

01207ddd 01/11/2025 12:07 AM Leszek Koltunski

progress with Ghosts

d2379d27 01/10/2025 10:18 PM Leszek Koltunski

Work on Ghosts

febc0088 01/09/2025 04:25 PM Leszek Koltunski

minor

25cb35a4 01/08/2025 02:26 PM Leszek Koltunski

replace all andoird logging with System.out.println

4849c8fb 01/08/2025 12:34 PM Leszek Koltunski

minor bugfix: eliminate too long move angles.

82f1e4ec 01/08/2025 12:14 PM Leszek Koltunski

Solver for Megaminx.

a3fc2045 01/08/2025 01:59 AM Leszek Koltunski

bugfix in SolverActivity and speedup in MoveProviderAlgs

ddd3b629 01/06/2025 09:15 PM Leszek Koltunski

minor

8a230c8a 01/06/2025 04:42 PM Leszek Koltunski

change one of objlib's APIs from 'onReplaceModeUP/Down' (which only comes when TouchControl is in REPLACE mode) to 'onStickerTouched/Untouched' (which reports the same thing, but comes always)

ff6c3ec3 01/06/2025 12:18 PM Leszek Koltunski

better minimalCubiesInRow in case of cuboids - take into account that the shapeshifters can be hollow inside if x>=3, y>=3, z>=3 (e.g. 3x3x5)

6c07919c 01/06/2025 11:19 AM Leszek Koltunski

minor

5077b360 01/06/2025 03:26 AM Leszek Koltunski

beginnings of PhasedSolverMegaminx.
Verifier & locked cubits done - now define the actual phases!

2ac63f09 01/05/2025 12:40 PM Leszek Koltunski

Move all the strings from objlib to the app.
Upgrade AGP from 8.1.4 to 8.3.2

3a2dfb4a 01/04/2025 05:08 PM Leszek Koltunski

New verifier mechanism finished and being used by both KILO3 and CUBE3 algorithmic solvers.

df49882b 01/04/2025 02:34 AM Leszek Koltunski

Progress with automatic verifiers.
Appears to work now in case of KILO_3 and CUBE_3.
In case of IVY_2, it crashes.

890a4de1 01/03/2025 12:08 AM Leszek Koltunski

beginnings of the Kilominx verifier

62b5f22f 01/02/2025 06:06 PM Leszek Koltunski

beginnings of ther Kilominx verifier

5511be45 01/02/2025 02:46 PM Leszek Koltunski

comment

8b7cd142 01/02/2025 02:26 PM Leszek Koltunski

minor

b5469532 01/02/2025 12:35 PM Leszek Koltunski

Another part of the fix for shape-shifting cuboids: we need to write numLayers to JSON (rather than computing it from mRotatable) because it turns out mNumLayers can be different than the lengths of mRotatable!

This and new object JSONs for the 3 shape-shifters (other object default back to the old method of computing numLayers on read from JSON)

df0430a6 01/02/2025 11:45 AM Leszek Koltunski

fix for scrambling shape-shifting cuboids. Before when scrambling e.g. the CU_242, we would sometimes 'hit air' (try to rotate a layer which does not have any cubits in it)

843b7ee4 12/31/2024 05:15 PM Leszek Koltunski

Algorithmic solvers (at least the 3x3 beginner and the Kilominx) seem to be working now.

d2ea2873 12/31/2024 01:54 PM Leszek Koltunski

progress with Algorithmic solvers. Seem to solve all right now; but still problems with which cubits it lights.

d959e795 12/31/2024 01:28 PM Leszek Koltunski

fixes for Algorithmic solvers (but those still do not work correctly!)

0c6911df 12/30/2024 11:09 PM Leszek Koltunski

a dialog to interrupt too long solves

9c393b7d 12/30/2024 12:25 AM Leszek Koltunski

Add the 'interrupt()' API to all solvers
Add the 'start/stopSolving' notification to ResultScreen

7634b27a 12/29/2024 01:59 AM Leszek Koltunski

Initial support for Algorithmic Kilominx verifier and introduction of it into the App.

c389d4ba 12/28/2024 11:09 PM Leszek Koltunski

Do not call the Kociemba solver on an already solved position.

a918a340 12/28/2024 10:54 PM Leszek Koltunski

Integration of the Algorithmic solver 'SolverAlgorithmicCUBE3' with the app pretty much done.

9dd01365 12/28/2024 12:27 AM Leszek Koltunski

3x3 position validator finished; what's left is compute the quat table knowing the position is correct.

9a05b7dc 12/27/2024 01:03 PM Leszek Koltunski

Properly define and separate the interface between the App and the 'solver' part of the objectlib. Move the 'position verifiers' to the objectlib.