From 88b636ab9faf02bd0d1ad7847b499dcdeafc468c Mon Sep 17 00:00:00 2001 From: alexfung <1.alexfung@gmail.com> Date: Thu, 6 Feb 2020 15:14:16 +0800 Subject: [PATCH 1/4] fix local demo --- demo/alg.html | 14 ++++++++++++++ demo/cubexp.html | 30 ++++++++++++++++++++++++++++++ demo/other.html | 29 +++++++++++++++++++++++++++++ demo/readme.html | 33 +++++++++++++++++++++++++++++++++ demo/sample.html | 22 ++++++++++++++++++++++ demo/solved.html | 27 +++++++++++++++++++++++++++ demo/tweaks.html | 22 ++++++++++++++++++++++ lib/bom.txt | 1 + 8 files changed, 178 insertions(+) create mode 100644 demo/alg.html create mode 100644 demo/cubexp.html create mode 100644 demo/other.html create mode 100644 demo/readme.html create mode 100644 demo/sample.html create mode 100644 demo/solved.html create mode 100644 demo/tweaks.html create mode 100644 lib/bom.txt diff --git a/demo/alg.html b/demo/alg.html new file mode 100644 index 0000000..ec0ffe5 --- /dev/null +++ b/demo/alg.html @@ -0,0 +1,14 @@ + + + + + +

Roofpig 'alg' demo

+
Basic moves
+ +
Standard advanced moves
+ +
Roofpig advanced moves
diff --git a/demo/cubexp.html b/demo/cubexp.html new file mode 100644 index 0000000..cc1f4e2 --- /dev/null +++ b/demo/cubexp.html @@ -0,0 +1,30 @@ + + + + + +

Roofpig Cubexp Lab

+ +
UFR DFR LF R
+
UfR DFr lF R
+
F*
+
FR*
+
U-
+
BD-
+
BLD-
+
FB-
+
r
+
*/mc
+
r/e
diff --git a/demo/other.html b/demo/other.html new file mode 100644 index 0000000..da47dab --- /dev/null +++ b/demo/other.html @@ -0,0 +1,29 @@ + + + + + +

Roofpig various options Demo

+ +
colors in pink
+
non sticker colors
+
startsolved
+ +
algdisplay=fancy2s
+
algdisplay=rotations 2p
+ +
hover=far
+
hover=5
+
hover=near
+
hover=none
diff --git a/demo/readme.html b/demo/readme.html new file mode 100644 index 0000000..524538c --- /dev/null +++ b/demo/readme.html @@ -0,0 +1,33 @@ + + + + +

Offline demo

+

+ The original roofpig demos are at jsfiddle.net + They are no longer operational, because they tried to load the roofpig_and_three.js over http. + Therefore, I downloaded the demo file so I can run them offline. +

+ The demo files refer to the roofpig JS file at the root of this repo. + The script has non-ANSI characters, and most browsers will not like it. + To browse the demo locally, you may need to manually add BOM at the start of the file. + A bom.txt is included under /lib for you. +

+

+ Also, I added an extra demo file for the changes I made to the repo. +

+

Demo pages

+ + diff --git a/demo/sample.html b/demo/sample.html new file mode 100644 index 0000000..c8fe235 --- /dev/null +++ b/demo/sample.html @@ -0,0 +1,22 @@ + + + + + +

Roofpig Feature Sample

+ +
Simple.             Helpful ->
+ +
Customizable. Edgy.
+ +
Big. Visible. Fast.
diff --git a/demo/solved.html b/demo/solved.html new file mode 100644 index 0000000..be34f0b --- /dev/null +++ b/demo/solved.html @@ -0,0 +1,27 @@ + + + + + +

Roofpig solved and colored Lab

+ +
Cross
+
F2L
+
PLL
+
OLL
+
Petrus Step 1
+
Petrus Step 2
+
Petrus Step 3
+
Petrus Step 4
diff --git a/demo/tweaks.html b/demo/tweaks.html new file mode 100644 index 0000000..cec4147 --- /dev/null +++ b/demo/tweaks.html @@ -0,0 +1,22 @@ + + + + + +

Roofpig 'setupmoves' and 'tweaks' Lab

+ +
setupmoves
+
color tweaks
+
X tweaks
+
All at once
diff --git a/lib/bom.txt b/lib/bom.txt new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/lib/bom.txt @@ -0,0 +1 @@ + \ No newline at end of file From 34b6ebc8adb07b1a0275de013669d263ff7b3b39 Mon Sep 17 00:00:00 2001 From: alexfung <1.alexfung@gmail.com> Date: Thu, 6 Feb 2020 15:56:19 +0800 Subject: [PATCH 2/4] feat demo for alexfung branches. At this commit, the demo file shows that the existing roofpig.js displays wrong colors at the START position when M/E/S slice moves or x//y/z rotations are involved. --- demo/alexfung.html | 40 ++++++++++++++++++++++++++++++++++++++++ demo/readme.html | 1 + 2 files changed, 41 insertions(+) create mode 100644 demo/alexfung.html diff --git a/demo/alexfung.html b/demo/alexfung.html new file mode 100644 index 0000000..624b5e2 --- /dev/null +++ b/demo/alexfung.html @@ -0,0 +1,40 @@ + + + + + +

alexfung commits demo

+

+ This demo page shows the effects of the commits on the alexfung branch, + which is a fork of the 1.4 master. +

+ The demo files refer to the roofpig JS file at the root of this repo. + That file is not exactly the same as the output of the build process. + The roofpig JS file contains non-ANSI characters and may confuse browsers. + I have added BOM to the roofpig JS file at the root of this repo to make sure browsers know it is a UTF-8 file. +

+

Color Fix

+

+ In 1.4 (and 1.5P) color is not assigned correctly if alg= includes any M/E/S slice movement or x/y/z rotation. + Fixed in the color fix commit. +

+ +
Normal: U on top
+ +
color fix for M
+ +
color fix for X
diff --git a/demo/readme.html b/demo/readme.html index 524538c..8078d87 100644 --- a/demo/readme.html +++ b/demo/readme.html @@ -23,6 +23,7 @@

Offline demo

Demo pages