Project

General

Profile

Statistics
| Branch: | Revision:

distorted-objectlib / src / main / java / org / distorted / objectlib / json @ fccc7c8a

# Date Author Comment
f2b21ce0 03/18/2025 11:22 AM Leszek Koltunski

move the 'VariantFaceIsOuter' info into the ObjectShape class.

53889ae7 03/11/2025 02:13 PM Leszek Koltunski

change the OBJECT_VERSION to 18

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

ghost-releted changes to the JSON !

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)

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

compiles now

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)

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

progress with Ghosts

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

Work on Ghosts

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

replace all andoird logging with System.out.println

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)

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

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

2dffa5a8 12/15/2024 10:52 PM Leszek Koltunski

remove numLayers from parameter list of 3 next methods.

e917a9e9 12/15/2024 09:50 PM Leszek Koltunski

remove numLayers from 4 API methods.

d1bc7ba0 12/08/2024 12:08 PM Leszek Koltunski

Finally! Split TwistyObject into:

- lower class 'TwistyObjectTheoretical' (an object that has no mesh, no stickers, cannot be touch-controlled, but knows how a real object of its kind moves - so can be used e.g. in solvers)

- everything else above it.

In the future, the 'everything else' will be further slipt into...

e42b3e42 10/03/2024 01:33 AM Leszek Koltunski

debugging the new 'surfaces' thing.

e64c87ad 06/10/2024 12:32 PM Leszek Koltunski

Rearrange the order of objectes in the main grid
Up object version to 16

ade99032 03/13/2024 01:30 PM Leszek Koltunski

Objects can support or not changing colors of their stickers.

1eafa9c6 03/12/2024 12:04 AM Leszek Koltunski

Fix the detection of the solved state.

962b8ff6 03/08/2024 03:48 PM Leszek Koltunski

progress with configurable stickers

e61a158a 01/29/2024 10:47 PM Leszek Koltunski

(limited) support for different strokes across each edge of each sticker.

71df2bd4 01/18/2024 04:47 PM Leszek Koltunski

progress with new sorting methods.

361fd0de 12/28/2023 05:40 PM Leszek Koltunski

Next step toward separating TwistyObject metadata.

ae9d9227 12/28/2023 03:48 PM Leszek Koltunski

Big step toward separating TwistyObject metadata.

da5551f4 12/21/2023 05:23 PM Leszek Koltunski

change complexity from int to float.

b9a7dcad 12/20/2023 01:17 PM Leszek Koltunski

14 is enough :)

3abf8f00 12/20/2023 01:10 PM Leszek Koltunski

final bugfix for scrambling shapeshifting cuboids; up JSON version to 15 (as we have a new scrambling type!)

64f13076 12/20/2023 11:58 AM Leszek Koltunski

beginnings of support of type=4 scrambling - shape-shifting cuboid.

63bfcdd1 12/16/2023 01:03 AM Leszek Koltunski

Support for shape-shifting cuboids. (except for the flat ones like the Super Floppy)

5ae0d190 11/11/2023 12:15 AM Leszek Koltunski

Make it possible to download objects with no extras file. Up VERSION_OBJECT_APP to 13.

30e03516 09/27/2023 02:17 PM Leszek Koltunski

Creator of Bandaged Skewbs finished.

97a75106 09/25/2023 02:23 PM Leszek Koltunski

separate ObjectSiguature into its own package and separate the BandagedSignatures out of it.

3ede7593 09/06/2023 11:13 PM Leszek Koltunski

progress with TwistyBandagedMegaminx.

b5744b1f 08/20/2023 12:30 PM Leszek Koltunski

Remove the generic 'MINOR' object and extras versions from JsonWriter, and replace them with per-ObjectType values. This was the reason why objects which had their 'minor' (really: version) updated to '1' in the server then never updated the jsons with locally stored versions.

ebe8c08e 08/02/2023 01:27 PM Leszek Koltunski

Support drawing stickers with multiple holes in them.

7e9a35eb 08/01/2023 11:38 PM Leszek Koltunski

change the way the coordinates of stickers are kept from float[2*N] to float[N][2]

9cd63ba8 07/24/2023 10:19 PM Leszek Koltunski

build.gradle: include directive to create a 'BuildConfig.java'
2 fixes for proper scrambling of locally created bandaged cuboids.

6612cbb4 07/24/2023 01:51 AM Leszek Koltunski

Progress with scrambling a bandaged pyraminx.

3d4cd65e 07/21/2023 11:19 PM Leszek Koltunski

Initial support for scrambling a bandaged pyraminx.

8edbe5b9 07/05/2023 10:23 PM Leszek Koltunski

minor

5377b942 06/19/2023 01:59 PM Leszek Koltunski

support Multigon in JSONs

deaf067b 06/01/2023 05:04 PM Leszek Koltunski

remember the rotation factors in the JSONs.

e17d01c2 05/31/2023 04:32 PM Leszek Koltunski

Fix the 'layer bitmaps in algorithms' feature.

464a5f12 05/31/2023 02:41 PM Leszek Koltunski

Correctly read JSONs with the previous 'scrambling algorithms' whch were not yet in 'bitmap' form.

b8eb07a5 05/30/2023 11:19 PM Leszek Koltunski

We have just introduced a non-backwards compatible improvement to the interpreter - up the interpreter version to 11.

b2e19fa7 05/10/2023 12:23 AM Leszek Koltunski

Coin tetrahedron: bugfix, new mesh & json; move to json version 10.

440f8e33 04/04/2023 11:19 AM Leszek Koltunski

remove all references to android.Context and android.Activity from distorted-objectlib

68d51549 03/23/2023 01:03 AM Leszek Koltunski

Up the MAJOR version to 9 to account for the new SPLIT type supported by the interpreter.

6a3c7c84 02/22/2023 10:24 PM Leszek Koltunski

Bump major to 8 (in accoount of the BAN6_4 - Burr Cube - where scrambling woudn't work with version 7)

5618c5a9 02/11/2023 06:39 PM Leszek Koltunski

separate the 'isSolved' part from TwistyObject

8f44228f 02/11/2023 12:26 AM Leszek Koltunski

Make the JSON reader capable of handling possible future 'BAN*_*' objects.

7bcd501d 02/09/2023 11:53 PM Leszek Koltunski

BAN5_4 and BAN6_4: fix creating their signatures (improper signatures --> wrong scrambling type 2!)

731280f7 01/31/2023 01:10 PM Leszek Koltunski

Minor.

28bfa000 01/31/2023 10:38 AM Leszek Koltunski

Make it possible to (fully!) read version 6 JSONs - some users might have Pyraminx Duo v. 6 already downloaded!

27a44b5e 01/29/2023 02:57 AM Leszek Koltunski

We need to support reading from earlier JSONs. Support v. 6 (partially - only the objects which do not have the new in v. 7 algorithms & edges - i.e. locally created bandaged cuboids)

e9ec2e9d 01/28/2023 08:38 PM Leszek Koltunski

Bugfixes

27249eea 01/28/2023 06:10 PM Leszek Koltunski

Produce new JSONs files (version 7, with new scrambling method)

9ba7f3f6 01/28/2023 02:28 AM Leszek Koltunski

Move scrambling to a new model where there are spearete scrambling 'algorithms' and 'edges' of the scrambling graph.
Now each edge can contain a whole algorithm, i.e. a sequence of moves leading from state to state, which permits construction of scrambling for more complicated bandaged objects such as the AI cube....

51262d81 01/24/2023 01:37 PM Leszek Koltunski

Fix touch-replacing colors of the stickers. Now correctly takes into account the shape of the sticker.

80fd07aa 01/09/2023 01:09 AM Leszek Koltunski

Bugfixes.

f8a992a9 01/08/2023 11:58 PM Leszek Koltunski

Bugfix for reading JSONs version 6.

8bb3e677 01/08/2023 10:14 PM Leszek Koltunski

Minor bugfixes for creating JSON files version 6 (with per-cubit lists of VertexEffects)

84a17011 01/08/2023 03:36 AM Leszek Koltunski

Major change in JSOn file format:

replace the old (corners,centers) system with a list of VertexEffects which are applied to each cubit variant.

958a6e81 01/03/2023 03:27 PM Leszek Koltunski

Very important bugfix for an issue which probably has been the reason for many mysterious behaviours in the past: the JsonReader class cannot be a singleton! Convert it into a normal 'instanced' class.
With it being a singleton there's a major issue: when we create a new TwistyObject from a JSON file (by, for example, going to PurchaseActivity) and then we come back to the old object (by, for example, going back to the main RubikActivity) - then the JsonReader inside the old object has read the new JSON file and thus many of the 'abstract' methods in the old TwistyObject (for example getShortName()) all of the sudden start returning new values!

8b3b1d85 12/20/2022 02:59 PM Leszek Koltunski

Changes to the initialization - initialize the 'bought objects'

b63235a0 12/09/2022 01:17 AM Leszek Koltunski

Make it possible to create Diamond and Icosahedron-shaped objects to be read from json.

6db8fe2e 11/16/2022 02:14 PM Leszek Koltunski

More support for pillowing; pillow Morphix and Jing by default.

c2b997b2 08/13/2022 11:50 PM Leszek Koltunski

IAP, part 3: non-free objects appear in the popup with a lock icon.

84224c99 08/12/2022 12:37 AM Leszek Koltunski

IAP, part 1: Introduce the concept of a 'free' and 'not free' object to

- ObjectType
- DownloadedObject
- RubikObject
- jsons

882a8142 07/28/2022 12:20 AM Leszek Koltunski

Make ObjectSignature ready for any size bandaged cube.

4c87f159 07/15/2022 12:56 AM Leszek Koltunski

main: license.

3ce95490 07/12/2022 03:28 PM Leszek Koltunski

Do not crash when something's wrong with the JSON file - handle this gracefully, do not change the object then, and report this to Firebase.

52cc8639 06/20/2022 12:33 AM Leszek Koltunski

Bugfix

69bd6b70 06/18/2022 11:59 PM Leszek Koltunski

A few code improvements.

fd9d4a2c 06/18/2022 01:55 AM Leszek Koltunski

Bugfix the the sticker overrides.

ff60e713 06/18/2022 12:49 AM Leszek Koltunski

Progress with sticker overrides.

3a0a23bf 06/17/2022 05:58 PM Leszek Koltunski

Beginnings of support for 'sticker overrides' - possibility to override the color of an individual face of an individual cubit. Ultimately this will enable overriding with any bitmap; so far only a solid color.

Also, fixes for two crashers.

40e77224 06/16/2022 01:12 AM Leszek Koltunski

Crazy Planets: now can be created in J1 M0 mode. J1 M1 still doesn't work.

7aae846c 06/15/2022 10:37 PM Leszek Koltunski

Crazy Planets: introduce cubit type and offset to the JSON; create (shared) mesh and all the JSONs.

dc369304 06/09/2022 12:48 AM Leszek Koltunski

Bugfix

1f656ca7 06/06/2022 05:23 PM Leszek Koltunski

Make the 4 built-in BandagedCuboids use the introduced InitData concept and remove all specific bandaged object classes.

8c8c6fcf 05/18/2022 12:47 AM Leszek Koltunski

Bump MAJOR version to 3 (we cannot intermix the new Mixup json objects with version 2 app interpreter)

efeca8ef 05/09/2022 03:01 PM Leszek Koltunski

Fixes for scrambling locally-produced bandaged cuboid.
Still does not work completely.

1d581993 05/08/2022 11:15 PM Leszek Koltunski

Introduce ObjectSignature that can incorporate 192-bit signatures (for 5x5x5 bandaged cubes).
ObjectScrambler does not fully work yet.

95123ad0 04/29/2022 04:28 PM Leszek Koltunski

Bandaged: progress with creating the object.

e7d3259a 04/24/2022 04:54 PM Leszek Koltunski

If we're updating an object, and it is the current object, reload it immediatelly so that the new version appears by itself.

938fc9af 04/24/2022 03:00 PM Leszek Koltunski

Support reading num of scrambles from json version 2.

beee90ab 04/22/2022 05:32 PM Leszek Koltunski

Preparation for Mixup Cube: take advantage of the recent bump in MAJOR_VERSION number and change the format of basicAngles to int[][] 'per-axis-per-layer' [ Mixup Cube has different basicAngle in its middle layers (8) - and different in its edge layers (4) ]

89bbd329 04/22/2022 04:00 PM Leszek Koltunski

Turns out latest changes to the FactorySticker force us to increment the MAJOR_VERSION as now we produce incompatible stickers. We'll also use this occasion to support the Mixup Cube (change basic rotations to per-layer-per-axis)

e85c8f90 03/28/2022 12:17 PM Leszek Koltunski

Bandaged 3x3: progress with saving.

5f54927b 02/25/2022 03:34 PM Leszek Koltunski

Preparation for local creation of puzzles: remove the 'ObjectType' enum from TwistyObject class.

10b7e306 02/21/2022 02:29 PM Leszek Koltunski

New, generalized ScrambleState generator that should work for any bandaged 3x3.

ef021035 02/01/2022 03:11 PM Leszek Koltunski

Downloaded Objects: bugfixes

bf52deb2 02/01/2022 01:30 PM Leszek Koltunski

Downloaded Objects more or less work now.

4bf52f4f 01/20/2022 08:21 PM Leszek Koltunski

Progress downloading objects and extras.

a2d6c41a 01/17/2022 03:17 PM Leszek Koltunski

Re-organize tutorial list so that we can pull this one from JSON files.

052e0362 01/16/2022 03:59 PM Leszek Koltunski

Step towards tutorial JSON files.

253e440f 01/13/2022 04:57 PM Leszek Koltunski

Configurable internal colors. This somehow screwed up the Container!

82904e62 01/07/2022 11:16 PM Leszek Koltunski

Implement the Windmill Cube

3c48fab9 01/06/2022 12:00 AM Leszek Koltunski

unify every isSolved() routine except one: part II : new JSONs.