Project

General

Profile

Statistics
| Branch: | Revision:

distorted-objectlib / src / main / java / org / distorted / objectlib / main @ 7c9291b4

# Date Author Comment
0e5da4c6 03/30/2025 10:56 PM Leszek Koltunski

rewrite Scrambling_Shapeshifter into a more generin Scrambling_Twophase

e8b2ca64 03/26/2025 11:37 PM Leszek Koltunski

Calvin's Cuboids: first attempt.

7b562ff7 03/25/2025 09:49 PM Leszek Koltunski

Initial support for the Rediminx

35deb19a 03/24/2025 11:05 PM Leszek Koltunski

fix scrambling of Ghosts

f2b21ce0 03/18/2025 11:22 AM Leszek Koltunski

move the 'VariantFaceIsOuter' info into the ObjectShape class.

c2f583c8 03/10/2025 11:35 PM Leszek Koltunski

minor

1a01d6db 03/10/2025 06:16 PM Leszek Koltunski

fix automatic rotations of Ghosts

3b40ec78 03/09/2025 11:41 AM Leszek Koltunski

Improvements to the rot model of Ghosts (for the 10th time)

b72400a3 03/09/2025 12:46 AM Leszek Koltunski

much better rot model for Ghosts. Should be fully correct in case of mode 'not always permitted' (i.e. when mGhostAngle does not divide basicAngle). In 'always permitted' mode (Ghost Pyramid!), we still need to do some more work.

e1cc59ff 03/08/2025 12:54 AM Leszek Koltunski

further fixes for ghosts

d62785d7 03/08/2025 12:16 AM Leszek Koltunski

fixes to touch control of ghosts

3ee9aac6 03/08/2025 12:09 AM Leszek Koltunski

fixes to touch control of ghosts

b57a5d52 03/06/2025 05:23 PM Leszek Koltunski

Progress with Ghost Pyramid. Still does not move fully ok

19dbb227 03/06/2025 03:09 PM Leszek Koltunski

Special 'ghost rotation always permitted' mode for the case when mGhostAngle divides the basic angle (Ghost Pyramid: 60 | 120 )

ef2e4213 03/06/2025 12:50 PM Leszek Koltunski

Correct cuts in the Ghost Pyramid

20e8f134 03/04/2025 03:23 PM Leszek Koltunski

remove debug

49d6bfd5 03/04/2025 03:22 PM Leszek Koltunski

1. fix Ghost 2x2
2. abstract out the TwistyGhostAbstract (in preparation for Ghost Pyramid & Ghost Skewb)

d1375429 03/03/2025 10:10 PM Leszek Koltunski

change the model of Ghosts.
Fix one problem in Dino4 solver error reporting

6f2366c5 02/28/2025 02:18 PM Leszek Koltunski

fix for the way Ghosts rotate

f25775b5 02/26/2025 07:00 PM Leszek Koltunski

Ghost 'staircase' model: new meshes and jsons.

b03776e1 02/26/2025 04:50 PM Leszek Koltunski

GhostCubes - staircase model finished

f1de5bee 02/25/2025 11:38 PM Leszek Koltunski

new staircase model appear to be working (2x2 and 3x3 ghosts survive 5 minute long manual scrambling)

bad30046 02/25/2025 11:36 AM Leszek Koltunski

minor

100148f3 02/24/2025 03:34 PM Leszek Koltunski

progress with the 'staircase' model for Ghosts.

b5deee4a 02/24/2025 12:50 PM Leszek Koltunski

progress with the 'staircase' model for Ghosts.

ae201dab 02/23/2025 01:53 AM Leszek Koltunski

progress with the 'staircase' model for Ghosts.

136ded27 02/19/2025 10:54 PM Leszek Koltunski

bugfixes for crashers

9c028ec3 02/19/2025 10:14 PM Leszek Koltunski

ghost-releted changes to the JSON !

d36cde4f 02/18/2025 11:35 PM Leszek Koltunski

progress

791e7ee8 02/18/2025 01:18 AM Leszek Koltunski

progress

b1c8257e 02/17/2025 10:39 PM Leszek Koltunski

progress with GhostCubes

4d696d4a 02/17/2025 11:40 AM Leszek Koltunski

minor

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

fix fastScrambling

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

consolidate TouchControl

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

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

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

progress with GhostCube

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

backing ghost moves works now.

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

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

progress

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

progress

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

several fixes for crashers

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

compiles now

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).

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

minor

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.

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

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)

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.

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

beginnings of ther Kilominx verifier

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

comment

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)

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!)

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

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

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.

9183c582 12/21/2024 08:05 PM Leszek Koltunski

Restructuring for the solvers in the app.

afc98920 12/20/2024 12:08 AM Leszek Koltunski

Glow cubits involved in the phase.

c8ed30cf 12/18/2024 02:49 PM Leszek Koltunski

minor

9f2009d0 12/16/2024 03:02 PM Leszek Koltunski

push objectRatio up from TwistyObjectControllable to the last layer.

8f2a7e05 12/16/2024 12:30 PM Leszek Koltunski

Carve out the fifth layer: touch control.

c77af894 12/16/2024 02:54 AM Leszek Koltunski

minor

01932078 12/16/2024 02:49 AM Leszek Koltunski

Carve out the fourth layer: stickers.

550a1c19 12/16/2024 02:20 AM Leszek Koltunski

Carve out the third layer from the Puzzle implementation: TwistyPuzzleSolved, i.e. detection of the solved state.

Next: the fourth layer: stickers.
Then: fifth layer: touch control.
Then: everything else. (metadata?)

6cba9e38 12/16/2024 01:26 AM Leszek Koltunski

API name changes; fix for Dino4's solved state!

7736c35f 12/15/2024 11:58 PM Leszek Koltunski

Minor