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 3d30794..81b2ee2 100644 Binary files a/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate and b/iOS/app/MMMemory.xcodeproj/project.xcworkspace/xcuserdata/mk.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/shared/javaScript.js b/shared/javaScript.js index d8395cb..298fd79 100644 --- a/shared/javaScript.js +++ b/shared/javaScript.js @@ -9,9 +9,11 @@ function memorySpace() { } function memoryItemPositions(c) { var pos = []; - var ids = Array.from(Array(c.itemsCount).keys()); + // @ts-ignore + var ids = utsIndexArray(c.itemsCount); ids.forEach(function (i) { - var row = Math.floor(i / 4); + // @ts-ignore + var row = utsFloor(i / 4); var x = memoryGap() + (i - row * 4) * memoryGap(); var y = memoryGap() + row * memoryGap(); // @ts-ignore diff --git a/shared/swift.swift b/shared/swift.swift index e096631..1ff3590 100644 --- a/shared/swift.swift +++ b/shared/swift.swift @@ -22,9 +22,11 @@ func memorySpace() -> Float { func memoryItemPositions(c: Context) -> [Position] { var pos: [Position] = [] - let ids = Array.from(Array(c.itemsCount).keys()); + // @ts-ignore + let ids = utsIndexArray(c.itemsCount); ids.forEach(i => { - let row = Math.floor(i / 4) + // @ts-ignore + let row = utsFloor(i / 4) let x = memoryGap() + (i - row * 4) * memoryGap() let y = memoryGap() + row * memoryGap() // @ts-ignore diff --git a/shared/typeScript.ts b/shared/typeScript.ts index 1740ddd..f2457b7 100644 --- a/shared/typeScript.ts +++ b/shared/typeScript.ts @@ -22,9 +22,11 @@ function memorySpace(): number { function memoryItemPositions(c: Context): Position[] { var pos: Position[] = [] - let ids = Array.from(Array(c.itemsCount).keys()); + // @ts-ignore + let ids = utsIndexArray(c.itemsCount); ids.forEach(i => { - let row = Math.floor(i / 4) + // @ts-ignore + let row = utsFloor(i / 4) let x = memoryGap() + (i - row * 4) * memoryGap() let y = memoryGap() + row * memoryGap() // @ts-ignore diff --git a/web/platform.js b/web/platform.js index 60777a5..db49309 100644 --- a/web/platform.js +++ b/web/platform.js @@ -1,6 +1,19 @@ +// Memory. + function memoryCreatePosition(x, y) { return { "x": x, "y": y, }; } + +// UTS. + +function utsFloor(value) { + return Math.floor(value); +} + +// Создать массив индексов от 0 до указанного числа `count`. +function utsIndexArray(count) { + return Array.from(Array(count).keys()); +} diff --git a/будущее b/будущее index 23fd79b..c01e445 100644 --- a/будущее +++ b/будущее @@ -1,9 +1,10 @@ 09.06: 19:00- * заменить for на forEach в TS +* ввести функцию заполнения массива индексами: utsIndexArray НАДО: -* ввести функцию заполнения массива индексами +* ввести utsFloor * конвертировать forEach * конвертить Math.floor * перейти на один файл swift