diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json new file mode 100644 index 0000000..72ffd48 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "logo_kante.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "logo_kante-1.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "logo_kante-2.jpg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg new file mode 100644 index 0000000..1ef166f Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg differ diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg new file mode 100644 index 0000000..1ef166f Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg differ diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg new file mode 100644 index 0000000..1ef166f Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg differ diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/Contents.json new file mode 100644 index 0000000..8401033 --- /dev/null +++ b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "logo_no_background.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "logo_no_background-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "logo_no_background-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-1.png b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-1.png new file mode 100644 index 0000000..07b8c65 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-1.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-2.png b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-2.png new file mode 100644 index 0000000..07b8c65 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background-2.png differ diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background.png b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background.png new file mode 100644 index 0000000..07b8c65 Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/logo_no_background.imageset/logo_no_background.png differ diff --git a/GoldWars/GoldWars/Scenes/MenuScene.swift b/GoldWars/GoldWars/Scenes/MenuScene.swift index a339e99..77103d1 100644 --- a/GoldWars/GoldWars/Scenes/MenuScene.swift +++ b/GoldWars/GoldWars/Scenes/MenuScene.swift @@ -39,9 +39,21 @@ class MenuScene: SKScene { let scnScene: SCNScene = { let scnScene = SCNScene() - let cylinder = SCNCylinder(radius: 120, height: 30) + let cylinder = SCNCylinder(radius: 250, height: 50) + + let material = SCNMaterial() + let material2 = SCNMaterial() + material.diffuse.contents = UIImage(named: "logo_no_background") + material2.diffuse.contents = UIImage(named: "logo_kante") + + cylinder.materials = [material2,material,material] + + let cylinderNode = SCNNode(geometry: cylinder) cylinderNode.eulerAngles = SCNVector3(x: Float(CGFloat.pi / 2), y: 0, z: Float(CGFloat.pi / 2)) + + + let action = SCNAction.rotateBy(x: CGFloat(GLKMathDegreesToRadians(360)), y:0 , z: 0, duration: 8) let forever = SCNAction.repeatForever(action) cylinderNode.runAction(forever) @@ -49,7 +61,7 @@ class MenuScene: SKScene { return scnScene }() - let node = SK3DNode(viewportSize: CGSize(width: 300, height: 300)) + let node = SK3DNode(viewportSize: CGSize(width: 250, height: 250)) node.scnScene = scnScene node.position = CGPoint(x: midX, y: midY + 200)