From 19025d4c1340f68b9bd1c6656f99ab5c651749d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Fri, 2 Jun 2023 19:57:38 +0300 Subject: [PATCH] d --- .../UserInterfaceState.xcuserstate | Bin 32292 -> 32292 bytes shared/JavaScript/memoryItemPositions.js | 18 +++++++++++++ shared/Swift/memoryItemPositions.swift | 11 ++++++++ shared/gen | 1 + shared/memoryItemPositions.ts | 25 ++++++++++++++++++ web/memory.html | 17 +++--------- будущее | 4 +++ прошлое | 4 +++ 8 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 shared/JavaScript/memoryItemPositions.js create mode 100644 shared/Swift/memoryItemPositions.swift create mode 100644 shared/memoryItemPositions.ts diff --git a/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate b/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate index 181e615d57a2cc46f067f9a61463fea05f6a8a5f..2aeda50b3b1882758360a67e60e28f0648da55f4 100644 GIT binary patch delta 18 acmZ4ThjGat#tjO*EcZONIWAV=Ed&5i5eJ3< delta 18 acmZ4ThjGat#tjO*ES+p!_ZO@176JfGsRv;I diff --git a/shared/JavaScript/memoryItemPositions.js b/shared/JavaScript/memoryItemPositions.js new file mode 100644 index 0000000..bdcae51 --- /dev/null +++ b/shared/JavaScript/memoryItemPositions.js @@ -0,0 +1,18 @@ +var Position = /** @class */ (function () { + function Position(x, y) { + this.x = x; + this.y = y; + } + return Position; +}()); +// @ts-nocheck +function memoryItemPositions(c) { + var pos = []; + for (var i = 0; i < c.itemsCount; i++) { + var row = Math.floor(i / 4); + var x = memoryGap() + (i - row * 4) * memoryGap(); + var y = memoryGap() + row * memoryGap(); + pos.push(new Position(x, y)); + } + return pos; +} diff --git a/shared/Swift/memoryItemPositions.swift b/shared/Swift/memoryItemPositions.swift new file mode 100644 index 0000000..e4a51a9 --- /dev/null +++ b/shared/Swift/memoryItemPositions.swift @@ -0,0 +1,11 @@ +// @ts-nocheck +func memoryItemPositions(c: Context) -> [Position] { + var pos = [Position] + for (var i = 0; i < c.itemsCount; i++) { + let row = Math.floor(i / 4) + let x = memoryGap() + (i - row * 4) * memoryGap() + let y = memoryGap() + row * memoryGap() + pos.push(Position(x, y)) + } + return pos +} diff --git a/shared/gen b/shared/gen index 2dfb2e7..66bb530 100755 --- a/shared/gen +++ b/shared/gen @@ -4,6 +4,7 @@ SCRIPT_DIR=$(cd "$(dirname "$0")" ; pwd -P) FILES=( memoryGap + memoryItemPositions memorySide memorySpace ) diff --git a/shared/memoryItemPositions.ts b/shared/memoryItemPositions.ts new file mode 100644 index 0000000..b96e798 --- /dev/null +++ b/shared/memoryItemPositions.ts @@ -0,0 +1,25 @@ +interface Context { + itemsCount: number +} + +class Position { + x: number + y: number + + constructor(x, y) { + this.x = x + this.y = y + } +} + +// @ts-nocheck +function memoryItemPositions(c: Context): Position[] { + var pos: Position[] = [] + for (var i = 0; i < c.itemsCount; i++) { + let row = Math.floor(i / 4) + let x = memoryGap() + (i - row * 4) * memoryGap() + let y = memoryGap() + row * memoryGap() + pos.push(new Position(x, y)) + } + return pos +} diff --git a/web/memory.html b/web/memory.html index a8def0a..6a38491 100644 --- a/web/memory.html +++ b/web/memory.html @@ -6,20 +6,9 @@ + -