diff --git a/ogs-chkgfx/dialect.yml b/ogs-chkgfx/dialect.yml index 1d28d65..074422f 100644 --- a/ogs-chkgfx/dialect.yml +++ b/ogs-chkgfx/dialect.yml @@ -18,7 +18,6 @@ ChkgfxComponent: ChkgfxContext: type: context fields: - didClickLoadModel: Bool didLaunch: Bool didSetup: Bool @@ -26,7 +25,6 @@ RenderContext: type: context fields: backingPixelSize: [Int32] - didClickIncrement: Bool didLaunch: Bool didPrepareGL: Bool didSetup: Bool @@ -37,10 +35,10 @@ RenderContext: RenderComponent: type: component oneliners: - - didClickIncrement: renderLoadCubeModel(RenderVM.shared!) - didPrepareGL: renderInit(RenderVM.shared!) - didPrepareGL: RenderVM.shared!.didPrepareGL = true - didPrepareGL: renderStartTimer(RenderVM.shared!) + - didPrepareGL: renderLoadCubeModel(RenderVM.shared!) - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize - willDeinit: renderDeinit(RenderVM.shared!) shoulds: diff --git a/ogs-chkgfx/ver-mac/src/dialect.swift b/ogs-chkgfx/ver-mac/src/dialect.swift index d76883c..db74862 100644 --- a/ogs-chkgfx/ver-mac/src/dialect.swift +++ b/ogs-chkgfx/ver-mac/src/dialect.swift @@ -120,8 +120,6 @@ func registerOneliners( // Context field names for static type check public struct F { public static let backingPixelSize = "backingPixelSize" - public static let didClickIncrement = "didClickIncrement" - public static let didClickLoadModel = "didClickLoadModel" public static let didLaunch = "didLaunch" public static let didPrepareGL = "didPrepareGL" public static let didSetup = "didSetup" @@ -131,17 +129,13 @@ public struct F { } public struct ChkgfxContext: DialectContext { - public var didClickLoadModel = Bool() public var didLaunch = Bool() public var didSetup = Bool() public var recentField = "" public func field(_ name: String) -> T { - if (name == "didClickLoadModel") { - return didClickLoadModel as! T - } - else if (name == "didLaunch") { + if (name == "didLaunch") { return didLaunch as! T } else if (name == "didSetup") { @@ -155,10 +149,7 @@ public struct ChkgfxContext: DialectContext { _ name: String, _ value: Any ) { - if (name == "didClickLoadModel") { - didClickLoadModel = value as! Bool - } - else if (name == "didLaunch") { + if (name == "didLaunch") { didLaunch = value as! Bool } else if (name == "didSetup") { @@ -170,7 +161,6 @@ public struct ChkgfxContext: DialectContext { public struct RenderContext: DialectContext { public var backingPixelSize = [Int32]() - public var didClickIncrement = Bool() public var didLaunch = Bool() public var didPrepareGL = Bool() public var didSetup = Bool() @@ -184,9 +174,6 @@ public struct RenderContext: DialectContext { if (name == "backingPixelSize") { return backingPixelSize as! T } - else if (name == "didClickIncrement") { - return didClickIncrement as! T - } else if (name == "didLaunch") { return didLaunch as! T } @@ -216,9 +203,6 @@ public struct RenderContext: DialectContext { if (name == "backingPixelSize") { backingPixelSize = value as! [Int32] } - else if (name == "didClickIncrement") { - didClickIncrement = value as! Bool - } else if (name == "didLaunch") { didLaunch = value as! Bool } @@ -347,10 +331,10 @@ func renderRegisterShoulds(_ ctrl: DialectController) { func renderRegisterEffects(_ ctrl: DialectController) { let _: RenderContext? = registerOneliners(ctrl, [ - F.didClickIncrement, { (c: RenderContext) in renderLoadCubeModel(RenderVM.shared!) }, F.didPrepareGL, { (c: RenderContext) in renderInit(RenderVM.shared!) }, F.didPrepareGL, { (c: RenderContext) in RenderVM.shared!.didPrepareGL = true }, F.didPrepareGL, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) }, + F.didPrepareGL, { (c: RenderContext) in renderLoadCubeModel(RenderVM.shared!) }, F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize }, F.willDeinit, { (c: RenderContext) in renderDeinit(RenderVM.shared!) }, diff --git a/ogs-mahjong/ver-mac/res b/ogs-mahjong/ver-mac/res deleted file mode 120000 index 8f3459f..0000000 --- a/ogs-mahjong/ver-mac/res +++ /dev/null @@ -1 +0,0 @@ -../../res \ No newline at end of file diff --git a/ogs-mahjong/ver-mac/res/AppIcon.icns b/ogs-mahjong/ver-mac/res/AppIcon.icns new file mode 120000 index 0000000..7e98160 --- /dev/null +++ b/ogs-mahjong/ver-mac/res/AppIcon.icns @@ -0,0 +1 @@ +../../../res/AppIcon.icns \ No newline at end of file diff --git a/ogs-mahjong/ver-mac/res/cube b/ogs-mahjong/ver-mac/res/cube new file mode 120000 index 0000000..24cd8a9 --- /dev/null +++ b/ogs-mahjong/ver-mac/res/cube @@ -0,0 +1 @@ +../../../res/cube \ No newline at end of file diff --git a/util/step/packageMac b/util/step/packageMac index 529a496..b1dce61 100755 --- a/util/step/packageMac +++ b/util/step/packageMac @@ -14,4 +14,4 @@ mkdir -p "$APP_DAT/MacOS" mkdir -p "$APP_DAT/Resources" cp "$SDIR/../$TARGET/ver-mac/.build/debug/$TARGET" "$APP_DAT/MacOS/$TARGET" cp "$SDIR/../$TARGET/ver-mac/Info.plist" "$APP_DAT/Info.plist" -cp -R "$SDIR/../$TARGET/ver-mac/res/." "$APP_DAT/Resources/" +cp -R "$SDIR/../$TARGET/ver-mac/res/*" "$APP_DAT/Resources/"