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 2b53817..3d30794 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/gen b/shared/gen index b63f016..2552ac8 100755 --- a/shared/gen +++ b/shared/gen @@ -2,6 +2,6 @@ SCRIPT_DIR=$(cd "$(dirname "$0")" ; pwd -P) -tsc $SCRIPT_DIR/typeScript.ts --outfile $SCRIPT_DIR/javaScript.js +tsc $SCRIPT_DIR/typeScript.ts --lib es6 --outfile $SCRIPT_DIR/javaScript.js $SCRIPT_DIR/../toSwift $SCRIPT_DIR/typeScript.ts $SCRIPT_DIR/swift.swift diff --git a/shared/javaScript.js b/shared/javaScript.js index e7acc21..d8395cb 100644 --- a/shared/javaScript.js +++ b/shared/javaScript.js @@ -9,12 +9,13 @@ function memorySpace() { } function memoryItemPositions(c) { var pos = []; - for (var i = 0; i < c.itemsCount; i++) { + var ids = Array.from(Array(c.itemsCount).keys()); + ids.forEach(function (i) { var row = Math.floor(i / 4); var x = memoryGap() + (i - row * 4) * memoryGap(); var y = memoryGap() + row * memoryGap(); // @ts-ignore pos.push(memoryCreatePosition(x, y)); - } + }); return pos; } diff --git a/shared/swift.swift b/shared/swift.swift index 4973e36..e096631 100644 --- a/shared/swift.swift +++ b/shared/swift.swift @@ -21,12 +21,14 @@ func memorySpace() -> Float { func memoryItemPositions(c: Context) -> [Position] { var pos: [Position] = [] - for (var i = 0; i < c.itemsCount; i++) { + + let ids = Array.from(Array(c.itemsCount).keys()); + ids.forEach(i => { let row = Math.floor(i / 4) let x = memoryGap() + (i - row * 4) * memoryGap() let y = memoryGap() + row * memoryGap() // @ts-ignore pos.push(memoryCreatePosition(x, y)) - } + }) return pos } diff --git a/shared/typeScript.ts b/shared/typeScript.ts index 5ff9050..1740ddd 100644 --- a/shared/typeScript.ts +++ b/shared/typeScript.ts @@ -21,12 +21,14 @@ function memorySpace(): number { function memoryItemPositions(c: Context): Position[] { var pos: Position[] = [] - for (var i = 0; i < c.itemsCount; i++) { + + let ids = Array.from(Array(c.itemsCount).keys()); + ids.forEach(i => { let row = Math.floor(i / 4) let x = memoryGap() + (i - row * 4) * memoryGap() let y = memoryGap() + row * memoryGap() // @ts-ignore pos.push(memoryCreatePosition(x, y)) - } + }) return pos } diff --git a/будущее b/будущее index 0b32b11..23fd79b 100644 --- a/будущее +++ b/будущее @@ -1,6 +1,10 @@ +09.06: 19:00- + +* заменить for на forEach в TS НАДО: -* конвертировать for loop +* ввести функцию заполнения массива индексами +* конвертировать forEach * конвертить Math.floor * перейти на один файл swift * генерить memoryItemPositions.swift