Fix load image bug in bundle

BalestraPatrick · May 29, 2016 · b485156 · b485156
1 parent 42c5c6f
commit b485156
Show file tree

Hide file tree

Showing 9 changed files with 189 additions and 187 deletions.
diff --git a/Example/ParticlesLoadingView.xcodeproj/project.pbxproj b/Example/ParticlesLoadingView.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7C5775822FA8BD465BD69310 /* Pods_ParticlesLoadingView_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21B343C7A3ABA308245341FE /* Pods_ParticlesLoadingView_Example.framework */; };
 		AE4CA89A1CEC66DA0074E71F /* Pods_ParticlesLoadingView_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE4CA8991CEC66DA0074E71F /* Pods_ParticlesLoadingView_Example.framework */; };
 		AE4CA89B1CEC67D00074E71F /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = AEBB69BF1CEC6303001DB4CA /* LaunchScreen.xib */; };
 		AE4CA89C1CEC67D00074E71F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AEBB69C11CEC6303001DB4CA /* Main.storyboard */; };
@@ -43,6 +44,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				AE4CA89A1CEC66DA0074E71F /* Pods_ParticlesLoadingView_Example.framework in Frameworks */,
+				7C5775822FA8BD465BD69310 /* Pods_ParticlesLoadingView_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ParticlesLoadingView (0.1.0)
+  - ParticlesLoadingView (0.2)
 
 DEPENDENCIES:
   - ParticlesLoadingView (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ParticlesLoadingView: b758b3305cee56b3fa2c3aa23a97bbe45e71acb4
+  ParticlesLoadingView: bf9d4b07166ed7d692b1275f7368862da89ee60f
 
 PODFILE CHECKSUM: 045949d6f37f0559cd4ad92def787e1fe4d41009
 

diff --git a/Example/Pods/Local Podspecs/ParticlesLoadingView.podspec.json b/Example/Pods/Local Podspecs/ParticlesLoadingView.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/ParticlesLoadingView/Info.plist b/Example/Pods/Target Support Files/ParticlesLoadingView/Info.plist
diff --git a/.../Target Support Files/ParticlesLoadingView/ResourceBundle-ParticlesLoadingView-Info.plist b/.../Target Support Files/ParticlesLoadingView/ResourceBundle-ParticlesLoadingView-Info.plist
diff --git a/ParticlesLoadingView.podspec b/ParticlesLoadingView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "ParticlesLoadingView"
-s.version          = "0.1.1"
+s.version          = "0.2"
 s.summary          = "A loading animation made of particles."
 s.description      = "A customizable SpriteKit particles animation on the border of a view."
 s.homepage         = "https://github.com/BalestraPatrick/ParticlesLoadingView"

diff --git a/Pod/Classes/EmitterCreator.swift b/Pod/Classes/EmitterCreator.swift
@@ -21,9 +21,11 @@ public class EmitterCreator {
     ///
     /// - returns: The emitter node object.
     func createEmitterNode(effect: ParticleEffect) throws -> SKEmitterNode {
-        let bundleName = NSBundle(forClass: self.dynamicType).infoDictionary!["CFBundleName"] as! String
+        let bundle = NSBundle(forClass: self.dynamicType)
+        let bundleName = bundle.infoDictionary!["CFBundleName"] as! String
         let path = NSBundle(forClass: self.dynamicType).pathForResource(effect.rawValue, ofType: "sks", inDirectory: "\(bundleName).bundle")
-        if let path = path, let emitter = NSKeyedUnarchiver.unarchiveObjectWithFile(path) as? SKEmitterNode {
+        if let path = path, let emitter = NSKeyedUnarchiver.unarchiveObjectWithFile(path) as? SKEmitterNode, let texture = UIImage(named: "spark", inBundle: bundle, compatibleWithTraitCollection: nil) {
+            emitter.particleTexture = SKTexture(image: texture)
             return emitter
         } else {
             throw EmitterError.EmitterNodeUnavailable