Merge remote-tracking branch 'cocos/develop' into CCBRename

Author: andykorth

Rakefile

@@ -32,6 +32,16 @@ def get_template_files
     end
 end
 
+def call_xctool command
+    reporter = "-reporter pretty"
+
+    if ENV["CIRCLE_CI"]
+        reporter = "-reporter plain -reporter junit:test_results.xml"
+    end
+
+    sh "xctool #{reporter} #{command}"
+end
+
 def get_artifact_name
     return @artifact_name if @artifact_name
     branch = `git rev-parse --abbrev-ref HEAD`.chomp
@@ -92,7 +102,9 @@ file "Generated/Version.txt" => "Generated" do |task|
     version_info["version"] = DEFAULT_SB_VERSION
     version_info["revision"] = ENV["REVISION"] || `git rev-parse --short=10 HEAD`.chomp
 
-    File.open("Generated/Version.txt","w") << JSON.pretty_generate(version_info)
+    f = File.open("Generated/Version.txt","w")
+    f.write JSON.pretty_generate(version_info)
+    f.close
 end
 
 file "Generated/cocos2d_version.txt" => 'SpriteBuilder/libs/cocos2d-iphone/VERSION' do |task|
@@ -115,28 +127,28 @@ namespace :build do
     end
 
     task :tests => [:generated,:build_requirements] do
-        sh "xctool -configuration Testing build-tests"
+        call_xctool "-configuration Testing build-tests"
     end
 end
 
 task :default => "build:generated"
 
 desc "Run SpriteBuilder unit tests"
 task :test => ["build:tests", :build_requirements] do
-    sh "xctool -configuration Testing run-tests"
+    call_xctool "-configuration Testing run-tests"
 end
 
 namespace :package do
     desc "Create SpriteBuilder.app + zip app and symbols"
     task :app do
-        sh "xctool TARGET_BUILD_DIR=#{BUILD_DIR} CONFIGURATION_BUILD_DIR=#{BUILD_DIR} VERSION=#{DEFAULT_SB_VERSION} -configuration Release build"
+        call_xctool "TARGET_BUILD_DIR=#{BUILD_DIR} CONFIGURATION_BUILD_DIR=#{BUILD_DIR} VERSION=#{DEFAULT_SB_VERSION} -configuration Release build"
         app, symbols = "NONE"
 
         built_files = `find . -name SpriteBuilder.app`.chomp.split "\n"
 
         app = built_files.max {|a,b| File.mtime(a) <=> File.mtime(b)}
         symbols = "#{app}.dSYM"
-        versioned_app_name = "#{DEFAULT_PRODUCT_NAME}-#{ENV["VERSION"]}.app"
+        versioned_app_name = "#{DEFAULT_PRODUCT_NAME}-#{DEFAULT_SB_VERSION}.app"
 
         unless File.exists? app and File.exists? symbols
             fail "Built products don't exist at #{app} and #{symbols}"
@@ -152,7 +164,7 @@ namespace :package do
 
     desc "Create SpriteBuilder.xcarchive and zip"
     task :archive do
-        sh "xctool TARGET_BUILD_DIR=#{BUILD_DIR} VERSION='#{DEFAULT_SB_VERSION}' -configuration Release archive -archivePath #{BUILD_DIR}/SpriteBuilder"
+        call_xctool "TARGET_BUILD_DIR=#{BUILD_DIR} VERSION='#{DEFAULT_SB_VERSION}' -configuration Release archive -archivePath #{BUILD_DIR}/SpriteBuilder"
 
         Dir.chdir BUILD_DIR do
             sh "zip -r SpriteBuilder.xcarchive.zip SpriteBuilder.xcarchive"
@@ -163,10 +175,10 @@ end
 desc "Build SpriteBuilder distribution"
 task :package => [:clobber, BUILD_DIR, :build_requirements] do
 
-    #force generation of a new Version.txt with commandline value
+    #force generation of a new Version.txt 
     Rake::Task["build:generated"].invoke
-
     Rake::Task["package:app"].invoke
+
     Rake::Task["clean"].invoke
     Rake::Task["package:archive"].invoke
 

SpriteBuilder/ccBuilder/CCNode+NodeInfo.h

@@ -91,6 +91,7 @@ NSString * kAnimationOfPhysicsWarning;
 - (void) loadCustomPropertiesFromSerialization:(id)ser;
 - (void) loadCustomPropertyValuesFromSerialization:(id)ser;
 - (BOOL) shouldDisableProperty:(NSString*) prop;
+- (BOOL)shouldDisableKeyframe:(NSString*) prop;
 
 - (void) setUsesFlashSkew:(BOOL)seqExpanded;
 - (BOOL) usesFlashSkew;

SpriteBuilder/ccBuilder/CCNode+NodeInfo.m

@@ -248,7 +248,7 @@ - (SequencerKeyframe*) addDefaultKeyframeForProperty:(NSString*)name atTime:(flo
     }
 
     // Do not add keyframes for disabled properties
-    if ([self shouldDisableProperty:name])
+    if ([self shouldDisableProperty:name] || [self shouldDisableKeyframe:name])
         return nil;
 
     // Create keyframe
@@ -851,7 +851,7 @@ - (void) loadCustomPropertyValuesFromSerialization:(id)ser
 - (BOOL) shouldDisableProperty:(NSString*) prop
 {
     // Disable properties on root node
-    if (self == [CocosScene cocosScene].rootNode || self.nodePhysicsBody.dynamic)
+    if (self == [CocosScene cocosScene].rootNode)
     {
         if ([prop isEqualToString:@"position"]) return YES;
         else if ([prop isEqualToString:@"scale"]) return YES;
@@ -879,7 +879,19 @@ - (BOOL) shouldDisableProperty:(NSString*) prop
     return NO;
 }
 
-
+- (BOOL)shouldDisableKeyframe:(NSString*) prop
+{
+    // Disable properties on root node
+    if (self.nodePhysicsBody.dynamic)
+    {
+        if ([prop isEqualToString:@"position"]) return YES;
+        else if ([prop isEqualToString:@"scale"]) return YES;
+        else if ([prop isEqualToString:@"rotation"]) return YES;
+        else if ([prop isEqualToString:@"skew"]) return YES;
+    }
+    
+    return NO;
+}
 
 - (GLKMatrix4) startMatrix;
 {

SpriteBuilder/ccBuilder/InspectorPropertyPaneBuilder.m

@@ -202,40 +202,6 @@ - (void)loadPropertyEditorNibWithType:(NSString *)type inspectorValue:(Inspector
     }
 }
 
-- (BOOL)isDisabledProperty:(NSString *)name animatable:(BOOL)animatable
-{
-    // Only animatable properties can be disabled
-    if (!animatable)
-    {
-        return NO;
-    }
-
-    SequencerSequence *sequence = _sequenceHandler.currentSequence;
-    SequencerNodeProperty *sequencerNodeProperty = [_node sequenceNodeProperty:name sequenceId:sequence.sequenceId];
-
-    // Do not disable if animation hasn't been enabled
-    if (!sequencerNodeProperty)
-    {
-        return NO;
-    }
-
-    // Disable visiblilty if there are keyframes
-    if (sequencerNodeProperty.keyframes.count > 0 && [name isEqualToString:@"visible"])
-    {
-        return YES;
-    }
-
-    // Do not disable if we are currently at a keyframe
-    if ([sequencerNodeProperty hasKeyframeAtTime:sequence.timelinePosition])
-    {
-        return NO;
-    }
-
-    // Between keyframes - disable
-    return YES;
-}
-
-
 - (void)resetKeyViewLoop
 {
     NSString *privateFunction = [NSString stringWithFormat:@"%@%@%@", @"_setDefault", @"KeyView", @"Loop"];
@@ -319,10 +285,6 @@ - (void)addProperties:(PlugInNode *)plugIn
         }
 
         BOOL readOnly = [propInfo[@"readOnly"] boolValue];
-        if ([self isDisabledProperty:name animatable:animated])
-        {
-            readOnly = YES;
-        }
 
         // Handle Flash skews
         BOOL usesFlashSkew = [_node usesFlashSkew];

SpriteBuilder/ccBuilder/InspectorValue.m

@@ -87,9 +87,47 @@ -(BOOL)readOnly
     if([selection shouldDisableProperty:propertyName])
         return YES;
 
+    if([self isDisabledProperty])
+        return YES;
+    
     return readOnly;
 }
 
+- (BOOL)isDisabledProperty
+{
+    BOOL animatable = [selection.plugIn isAnimatableProperty:propertyName node:selection];
+        
+    // Only animatable properties can be disabled
+    if (!animatable)
+    {
+        return NO;
+    }
+    
+    SequencerSequence *sequence = [SequencerHandler sharedHandler].currentSequence;
+    SequencerNodeProperty *sequencerNodeProperty = [selection sequenceNodeProperty:propertyName sequenceId:sequence.sequenceId];
+    
+    // Do not disable if animation hasn't been enabled
+    if (!sequencerNodeProperty)
+    {
+        return NO;
+    }
+    
+    // Disable visiblilty if there are keyframes
+    if (sequencerNodeProperty.keyframes.count > 0 && [propertyName isEqualToString:@"visible"])
+    {
+        return YES;
+    }
+    
+    // Do not disable if we are currently at a keyframe
+    if ([sequencerNodeProperty hasKeyframeAtTime:sequence.timelinePosition])
+    {
+        return NO;
+    }
+    
+    // Between keyframes - disable
+    return YES;
+}
+
 - (void) updateAffectedProperties
 {
     if (affectsProperties)

SpriteBuilder/ccBuilder/NodePhysicsBody.m

@@ -26,6 +26,7 @@
 #import "AppDelegate.h"
 #import "PolyDecomposition.h"
 #import "NSArray+Query.h"
+#import "SequencerHandler.h"
 
 #define kCCBPhysicsMinimumDefaultCircleRadius 16
 
@@ -41,7 +42,11 @@ - (id) initWithNode:(CCNode*) node
 
     [self setupDefaultPolygonForNode:node];
 
-    _dynamic = !node.hasKeyframes;
+    _dynamic = !([node hasKeyframesForProperty:@"position"] ||
+                 [node hasKeyframesForProperty:@"scale"]    ||
+                 [node hasKeyframesForProperty:@"rotation"] ||
+                 [node hasKeyframesForProperty:@"skew"]);
+    
     _affectedByGravity = YES;
     _allowsRotation = YES;
 
@@ -295,6 +300,8 @@ - (void) setDynamic:(BOOL)dynamic
 {
     [[AppDelegate appDelegate] saveUndoStateWillChangeProperty:@"*P*dynamic"];
     _dynamic = dynamic;
+    
+    [[SequencerHandler sharedHandler] redrawTimeline];
 }
 
 - (void) setAffectedByGravity:(BOOL)affectedByGravity

SpriteBuilder/ccBuilder/PhysicsHandler.m

@@ -43,6 +43,7 @@
 #import "CCBGLView.h"
 #import "InspectorController.h"
 #import "SBPasteboardTypes.h"
+#import "SequencerHandler.h"
 
 #define kCCBPhysicsHandleRadius 5
 #define kCCBPhysicsLineSegmFuzz 5
@@ -94,14 +95,17 @@ - (void) setSelectedNodePhysicsEnabled:(BOOL)enabled
 
     // Update physics body
     self.selectedNodePhysicsBody = [AppDelegate appDelegate].selectedNode.nodePhysicsBody;
+    
+    // Refresh Timeline
+    [[SequencerHandler sharedHandler] redrawTimeline];
 }
 
 - (BOOL) selectedNodePhysicsEnabled
 {
     return [AppDelegate appDelegate].selectedNode.nodePhysicsBody != nil;
 }
 
--(BOOL)selectedNodeHasKeyframes
+- (BOOL)selectedNodeHasKeyframes
 {
     if([AppDelegate appDelegate].selectedNode==nil) return FALSE;
 
@@ -110,7 +114,6 @@ -(BOOL)selectedNodeHasKeyframes
        [[AppDelegate appDelegate].selectedNode hasKeyframesForProperty:@"rotation"] ||
        [[AppDelegate appDelegate].selectedNode hasKeyframesForProperty:@"skew"]) {
 
-        [[AppDelegate appDelegate].selectedNode.physicsBody setType:CCPhysicsBodyTypeStatic];
         return TRUE;
     }
 

SpriteBuilder/ccBuilder/SequencerHandler.m

@@ -1613,7 +1613,8 @@ - (BOOL) canInsertKeyframeNamed:(NSString*)prop
 
     return !(!node
              || !prop
-             || [node shouldDisableProperty:prop])
+             || [node shouldDisableProperty:prop]
+             || [node shouldDisableKeyframe:prop])
            && [[node.plugIn animatablePropertiesForNode:node] containsObject:prop];
 
 }

SpriteBuilder/ccBuilder/SequencerStructureCell.m

@@ -100,7 +100,7 @@ - (void) drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
             SequencerNodeProperty* seqNodeProp = [node sequenceNodeProperty:prop sequenceId:seq.sequenceId];
             BOOL hasKeyframes = ([seqNodeProp.keyframes count] > 0);
 
-            if ([node shouldDisableProperty:prop])
+            if ([node shouldDisableProperty:prop] || [node shouldDisableKeyframe:prop])
             {
                 [attrib setObject:textColorDisabled forKey:NSForegroundColorAttributeName];
             }

circle.yml

@@ -5,7 +5,9 @@ checkout:
 test:
     override:
         - rake test
-
+    post:
+        - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+        - cp test_results.xml $CIRCLE_TEST_REPORTS/junit/
 deployment:
     develop:
         branch: develop