CATTY-446 Parse multiple scenes

Revert "CATTY-446 Parse multiple scenes" Resolved Parsing Error CATTY-446 Parse multiple scenes Now it is building. CATTY-446 Parse multiple scenes Now moved files in right Directory. Now it should also work on the test System. CATTY-446 Parse multiple scenes Fixed non building testcases. CATTY-446 Parse multiple scenes Fixed some Testcases. CATTY-446 Parse multiple scenes Removed failing testcases because the functions needed were removed in a previous version. CATTY-446 Parse multiple scenes Also removed declarations of the removed functions. CATTY-446 Fixed some testcases CATTY-446 Parse multiple scenes Fixed remaining test cases.
Catrobat · Sep 12, 2023 · b18b2fe · b18b2fe
1 parent e488257
commit b18b2fe
Show file tree

Hide file tree

Showing 83 changed files with 762 additions and 518 deletions.
diff --git a/src/Catty.xcodeproj/project.pbxproj b/src/Catty.xcodeproj/project.pbxproj
diff --git a/src/Catty/DataModel/Project/Project.h b/src/Catty/DataModel/Project/Project.h
@@ -31,7 +31,9 @@
 @interface Project : NSObject
 
 @property (nonatomic, strong, nonnull) Header *header;
-@property (nonatomic, strong, nonnull) Scene *scene;
+@property (nonatomic, strong, nonnull) NSMutableArray<Scene*> *scenes;
+@property (nonatomic, strong, nonnull) Scene *scene DEPRECATED_ATTRIBUTE; //needed for compadability with "Old Parser"
+@property (nonatomic, strong, nonnull) Scene *activeScene;
 @property (nonatomic, strong, nonnull) UserDataContainer *userData;
 @property (nonatomic, strong, nonnull) NSMutableSet<NSString*> *unsupportedElements;
 @property (nonatomic, strong, nonnull) NSMutableSet<NSString*> *physicsObjectNames;

diff --git a/src/Catty/DataModel/Project/Project.m b/src/Catty/DataModel/Project/Project.m
@@ -42,6 +42,8 @@ - (instancetype)init
     {
         _allBroadcastMessages = [[NSMutableOrderedSet alloc] init];
     }
+    self.scenes = [[NSMutableArray alloc] init];
+    [self.scenes addObject: [[Scene alloc] init]];
     return self;
 }
 
@@ -153,7 +155,11 @@ - (void)renameToProjectName:(NSString*)projectName andProjectId:(NSString*)proje
 
 - (NSArray<SpriteObject*>*)allObjects
 {
-    return self.scene.objects;
+    NSMutableArray<SpriteObject*> *objects = [[NSMutableArray<SpriteObject*> alloc] init];
+    for (Scene* scene in self.scenes) {
+        [objects addObjectsFromArray: [scene objects]];
+    }
+    return objects;
 }
 
 - (void)setDescription:(NSString*)description
@@ -163,7 +169,9 @@ - (void)setDescription:(NSString*)description
 
 - (void)removeReferences
 {
-    [self.scene.objects makeObjectsPerformSelector:@selector(removeReferences)];
+    for (Scene* scene in self.scenes){
+        [scene.objects makeObjectsPerformSelector:@selector(removeReferences)];
+    }
 }
 
 - (BOOL)isEqualToProject:(Project*)project
@@ -172,14 +180,23 @@ - (BOOL)isEqualToProject:(Project*)project
         return NO;
     if (! [self.userData isEqual:project.userData])
         return NO;
-    if (![self.scene isEqual:project.scene])
+    if ([self.scenes count] != [project.scenes count])
         return NO;
+    for (int i = 0; i < [self.scenes count]; ++i) {
+        if (![[self.scenes objectAtIndex: i] isEqual: [project.scenes objectAtIndex: i]])
+        return NO;
+    }
+
     return YES;
 }
 
 - (NSInteger)getRequiredResources
 {
-    return [self.scene getRequiredResources];
+    NSInteger requiredResources = 0;
+    for (Scene* scene in self.scenes) {
+        requiredResources |= [scene getRequiredResources];
+    }
+    return requiredResources;
 }
 #pragma mark - helpers
 
@@ -204,7 +221,7 @@ - (NSString*)description
     [ret appendFormat:@"Screen Height: %@\n", self.header.screenHeight];
     [ret appendFormat:@"Screen Width: %@\n", self.header.screenWidth];
     [ret appendFormat:@"Screen Mode: %@\n", self.header.screenMode];
-    [ret appendFormat:@"Scene: %@\n", self.scene];
+    [ret appendFormat:@"First Scene: %@\n", [self.scenes objectAtIndex:0]];
     [ret appendFormat:@"URL: %@\n", self.header.url];
     [ret appendFormat:@"User Handle: %@\n", self.header.userHandle];
     [ret appendFormat:@"Variables: %@\n", self.userData];
@@ -397,19 +414,21 @@ + (void)removeProjectFromDiskWithProjectName:(NSString*)projectName projectID:(N
 
 - (void)translateDefaultProject
 {
-    NSUInteger index = 0;
-    for (SpriteObject *spriteObject in self.scene.objects) {
-        if (index == kBackgroundObjectIndex) {
-            spriteObject.name = kLocalizedBackground;
-        } else {
-            NSMutableString *spriteObjectName = [NSMutableString stringWithString:spriteObject.name];
-            [spriteObjectName replaceOccurrencesOfString:kDefaultProjectBundleOtherObjectsNamePrefix
-                                              withString:kLocalizedMole
-                                                 options:NSCaseInsensitiveSearch
-                                                   range:NSMakeRange(0, spriteObjectName.length)];
-            spriteObject.name = (NSString*)spriteObjectName;
+    for (Scene* scene in self.scenes) {
+        NSUInteger index = 0;
+        for (SpriteObject *spriteObject in scene.objects) {
+            if (index == kBackgroundObjectIndex) {
+                spriteObject.name = kLocalizedBackground;
+            } else {
+                NSMutableString *spriteObjectName = [NSMutableString stringWithString:spriteObject.name];
+                [spriteObjectName replaceOccurrencesOfString:kDefaultProjectBundleOtherObjectsNamePrefix
+                                                  withString:kLocalizedMole
+                                                     options:NSCaseInsensitiveSearch
+                                                       range:NSMakeRange(0, spriteObjectName.length)];
+                spriteObject.name = (NSString*)spriteObjectName;
+            }
+            ++index;
         }
-        ++index;
     }
     [self renameToProjectName:kLocalizedMyFirstProject andShowSaveNotification:NO]; // saves to disk!
 }

diff --git a/...y/Extension&Delegate&Protocol/Extensions/UIViewController/UIViewControllerExtension.swift b/...y/Extension&Delegate&Protocol/Extensions/UIViewController/UIViewControllerExtension.swift
@@ -43,19 +43,21 @@ extension UIViewController {
     }
 
     @objc func openLoginScreen(_ delegate: AuthenticationDelegate? = nil) {
-        let storyboard = UIStoryboard.init(name: "iPhone", bundle: nil)
-        guard let viewController = storyboard.instantiateViewController(withIdentifier: "LoginController") as? LoginViewController else { return }
-        viewController.delegate = delegate
-        self.navigationController?.pushViewController(viewController, animated: true)
-    }
+
+        guard let viewController = storyboard?.instantiateViewController(withIdentifier: "LoginController") as? LoginViewController else { return }
+            viewController.delegate = delegate
+            self.navigationController?.pushViewController(viewController, animated: true)
+        }
 
     @objc func openProject(_ project: Project) {
         guard let viewController = self.instantiateViewController("SceneTableViewController") as? SceneTableViewController else { return }
 
-        viewController.scene = project.scene
+        guard let scene = project.scenes[0] as? Scene else { return }
+        viewController.scene = scene
         project.setAsLastUsedProject()
         self.navigationController?.pushViewController(viewController, animated: true)
-    }
+
+        }
 
     func openProjectDetails(projectId: String, storeProjectDownloader: StoreProjectDownloaderProtocol = StoreProjectDownloader()) {
         if let baseTableViewController = self as? BaseTableViewController {

diff --git a/src/Catty/FormulaEditor/ViewController/FormulaEditorViewController.h b/src/Catty/FormulaEditor/ViewController/FormulaEditorViewController.h
@@ -54,7 +54,5 @@
 - (void)backspace:(id)sender;
 - (NSString*)interpretFormula:(Formula*)formula forSpriteObject:(SpriteObject*)spriteObject;
 - (void)setParseErrorCursorAndSelection;
-
 - (void)handleInput;
-
 @end
diff --git a/src/Catty/IO/ProjectManager.swift b/src/Catty/IO/ProjectManager.swift
@@ -35,32 +35,34 @@
     @objc func createProject(name: String, projectId: String?) -> Project {
         let project = Project()
         let projectName = Util.uniqueName(name, existingNames: Project.allProjectNames())
-        project.scene = Scene(name: Util.defaultSceneName(forSceneNumber: 1))
-        project.scene.project = project
         project.header = Header.default()
         project.header.programName = projectName
         project.header.programID = projectId
 
+        let scene = Scene(name: Util.defaultSceneName(forSceneNumber: 1))
+        scene.project = project
+
         if fileManager.directoryExists(projectName) == false {
             fileManager.createDirectory(project.projectPath())
         }
 
-        let sceneDir = project.scene.path()
+        let sceneDir = scene.path()
         if !fileManager.directoryExists(sceneDir) {
             fileManager.createDirectory(sceneDir)
         }
 
-        let imagesDirName = project.scene.imagesPath()
+        let imagesDirName = scene.imagesPath()
         if fileManager.directoryExists(imagesDirName) == false {
             fileManager.createDirectory(imagesDirName)
         }
 
-        let soundDirName = project.scene.soundsPath()
+        let soundDirName = scene.soundsPath()
         if fileManager.directoryExists(soundDirName) == false {
             fileManager.createDirectory(soundDirName)
         }
 
-        project.scene.addObject(withName: kLocalizedBackground)
+        scene.addObject(withName: kLocalizedBackground)
+        project.scenes[0] = scene
 
         let filePath = project.projectPath() + kScreenshotAutoFilename
         let projectIconNames = UIDefines.defaultScreenshots
@@ -172,7 +174,7 @@
     }
 
     @objc func removeObjects(_ project: Project, objects: [SpriteObject]) {
-        let scene = project.scene
+        guard let scene = project.scenes[0] as? Scene else {return}
         for object in objects where scene.objects().contains(object) {
             scene.removeObject(object)
         }

diff --git a/src/Catty/PlayerEngine/Frontend/CBFrontend.swift b/src/Catty/PlayerEngine/Frontend/CBFrontend.swift
@@ -24,13 +24,11 @@ final class CBFrontend: CBFrontendProtocol {
 
     // MARK: - Properties
     let logger: CBLogger
-    private(set) weak var project: Project?
     private lazy var _sequenceFilters = [CBFrontendSequenceFilterProtocol]()
 
     // MARK: - Initializers
-    init(logger: CBLogger, project: Project?) {
+    init(logger: CBLogger) {
         self.logger = logger
-        self.project = project
     }
 
     // MARK: - Operations

diff --git a/src/Catty/PlayerEngine/Protocols/CBFrontendProtocol.swift b/src/Catty/PlayerEngine/Protocols/CBFrontendProtocol.swift
@@ -22,9 +22,6 @@
 
 protocol CBFrontendProtocol {
 
-    var project: Project? { get }
-
     func computeSequenceListForScript(_ script: Script) -> CBScriptSequenceList
     func addSequenceFilter(_ sequenceFilter: CBFrontendSequenceFilterProtocol)
-
 }
diff --git a/src/Catty/PlayerEngine/Sensors/Object/LayerSensor.swift b/src/Catty/PlayerEngine/Sensors/Object/LayerSensor.swift
@@ -61,11 +61,11 @@
     }
 
     static func defaultRawValue(for spriteObject: SpriteObject) -> Double {
-        guard let project = spriteObject.scene.project else {
+        guard let scene = spriteObject.scene else {
             return defaultRawValue
         }
 
-        let objectList = project.scene.objects()
+        let objectList = scene.objects()
         var zPosition = defaultRawValue
         for object in objectList {
             if object == spriteObject {

diff --git a/src/Catty/PlayerEngine/Stage/Builder/StageBuilder.swift b/src/Catty/PlayerEngine/Stage/Builder/StageBuilder.swift
@@ -90,7 +90,12 @@
         let audioEngine = getAudioEngine()
         let scheduler = getScheduler(broadcastHandler: broadcastHandler, formulaInterpreter: formulaManager, audioEngine: audioEngine)
 
-        return Stage(size: size,
+        guard let scene = project.scenes[0] as? Scene else {
+            preconditionFailure()
+        }
+
+        return Stage(scene: scene,
+                     size: size,
                      logger: logger,
                      scheduler: scheduler,
                      frontend: frontend,
@@ -125,7 +130,7 @@
     private func getFrontend() -> CBFrontendProtocol {
         guard let frontend = self.frontend else {
             guard let frontendLogger = Swell.getLogger(LoggerConfig.PlayerFrontendID) else { preconditionFailure() }
-            let frontend = CBFrontend(logger: frontendLogger, project: project)
+            let frontend = CBFrontend(logger: frontendLogger)
             frontend.addSequenceFilter(CBFilterDisabled())
             return frontend
         }

diff --git a/src/Catty/PlayerEngine/Stage/Stage.swift b/src/Catty/PlayerEngine/Stage/Stage.swift
@@ -27,6 +27,7 @@ final class Stage: SKScene, StageProtocol {
 
     // MARK: - Properties
     final let scheduler: CBSchedulerProtocol
+    private final let CBScene: Scene
     private final let frontend: CBFrontendProtocol
     private final let backend: CBBackendProtocol
     private final let broadcastHandler: CBBroadcastHandlerProtocol
@@ -35,14 +36,16 @@ final class Stage: SKScene, StageProtocol {
     private final let logger: CBLogger
     private var frameCounter: Int
 
-    init(size: CGSize,
+    init(scene: Scene,
+         size: CGSize,
          logger: CBLogger,
          scheduler: CBSchedulerProtocol,
          frontend: CBFrontendProtocol,
          backend: CBBackendProtocol,
          broadcastHandler: CBBroadcastHandlerProtocol,
          formulaManager: FormulaManagerProtocol,
          soundEngine: AudioEngineProtocol) {
+        self.CBScene = scene
         self.logger = logger
         self.scheduler = scheduler
         self.frontend = frontend
@@ -149,16 +152,12 @@ final class Stage: SKScene, StageProtocol {
     // MARK: - Start project
 
     @objc func startProject() -> Bool {
-        guard let project = frontend.project else {
-            //fatalError
-            debugPrint("Invalid project. This should never happen!")
-            return false
-        }
 
-        guard let spriteObjectList = project.scene.objects() as NSArray? as? [SpriteObject],
+        guard let spriteObjectList = CBScene.objects() as NSArray? as? [SpriteObject],
+            let project = CBScene.project,
             let variableList = UserDataContainer.allVariables(for: project) as NSArray? as? [UserVariable] else {
                 //fatalError
-                debugPrint("!! Invalid sprite object list given !! This should never happen!")
+                debugPrint("!! Invalid scene or sprite object list given !! This should never happen!")
                 return false
         }
         assert(Thread.current.isMainThread)
@@ -302,7 +301,9 @@ final class Stage: SKScene, StageProtocol {
         DispatchQueue.main.async {
             self.removeAllChildren() // remove all CBSpriteNodes from Scene
         }
-        frontend.project?.removeReferences() // remove all references in project hierarchy
+        CBScene.objects().forEach {
+            $0.removeReferences()
+        }
         formulaManager.stop()
         logger.info("All SpriteObjects and Scripts have been removed from Scene!")
         soundEngine.stop()

diff --git a/src/Catty/ViewController/Stage/StagePresenterViewController.m b/src/Catty/ViewController/Stage/StagePresenterViewController.m
@@ -304,17 +304,6 @@ - (void)setupStageAndStart
     [self continueActionWithDuration:UIDefines.firstSwipeDuration];
 }
 
--(void)resaveLooks
-{
-    dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void){
-        for (SpriteObject *object in self.project.scene.objects) {
-            for (Look *look in object.lookList) {
-                [[RuntimeImageCache sharedImageCache] loadImageFromDiskWithPath:look.fileName];
-            }
-        }
-    });
-}
-
 - (BOOL)prefersStatusBarHidden
 {
     return YES;
@@ -367,7 +356,7 @@ - (void)continueActionWithDuration:(CGFloat)duration
                          self.menuOpen = NO;
                          self.menuView.userInteractionEnabled = YES;
                          if (animateDuration == duration) {
-                             [self takeAutomaticScreenshotForSKView:self.skView andProject:self.project.scene];
+                             [self takeAutomaticScreenshotForSKView:self.skView andScene:[self.project.scenes objectAtIndex:0]];
                          }
                      }];
     self.skView.paused = NO;
@@ -454,7 +443,7 @@ - (void)aspectRatioAction
 
 - (void)takeScreenshotAction
 {
-    [self takeManualScreenshotForSKView:self.skView andProject:self.project.scene];
+    [self takeManualScreenshotForSKView:self.skView andScene: [self.project.scenes objectAtIndex: 0]];
 }
 
 - (void)shareDSTAction

diff --git a/src/Catty/ViewController/Stage/StagePresenterViewControllerScreenshotExtension.swift b/src/Catty/ViewController/Stage/StagePresenterViewControllerScreenshotExtension.swift
@@ -25,13 +25,13 @@
     public static var previewImageWidth: CGFloat { UIScreen.main.bounds.width }
     public static var previewImageHeight: CGFloat { previewImageWidth }
 
-    @objc(takeAutomaticScreenshotForSKView: andProject:)
+    @objc(takeAutomaticScreenshotForSKView: andScene:)
     func takeAutomaticScreenshot(for skView: SKView, and scene: Scene) {
         guard let snapshot = self.screenshot(for: skView) else { return }
         saveScreenshot(snapshot, for: scene, manualScreenshot: false)
     }
 
-    @objc(takeManualScreenshotForSKView: andProject:)
+    @objc(takeManualScreenshotForSKView: andScene:)
     func takeManualScreenshot(for skView: SKView, and scene: Scene) {
         guard let snapshot = self.screenshot(for: skView) else { return }
         saveScreenshot(snapshot, for: scene, manualScreenshot: true)

diff --git a/src/Catty/ViewController/Stage/StagePresenterViewControllerShareExtension.swift b/src/Catty/ViewController/Stage/StagePresenterViewControllerShareExtension.swift
@@ -29,7 +29,9 @@ extension StagePresenterViewController {
     func shareDST(embroideryService: EmbroideryProtocol) {
 
         var embroideryStream = [EmbroideryStream]()
-        for object in project.scene.objects() where !object.spriteNode.embroideryStream.isEmpty {
+
+        guard let scene = project.scenes[0] as? Scene else {return}
+        for object in scene.objects() where !object.spriteNode.embroideryStream.isEmpty {
             embroideryStream.append(object.spriteNode.embroideryStream)
         }
         let embroideryStreamMerged = EmbroideryStream(streams: embroideryStream)

diff --git a/src/Catty/XML/Old Parser/ProjectParser.m b/src/Catty/XML/Old Parser/ProjectParser.m
@@ -99,6 +99,7 @@ - (id)loadProject:(NSData*)xmlData {
     @try {
         NSInfo(@"Loading Project...");
         project = [self parseNode:doc.rootElement withParent:nil];
+        project.scenes[0] = project.scene;
         NSInfo(@"Loading done...");
     } @catch(NSException* ex) {
         NSError(@"Project could not be loaded! %@", [ex description]);