Changeset 1284

Timestamp:

03/07/10 18:18:37 (5 months ago)

Author:

dreisch

Message:

-fixed #1110

Location:

flash_player/trunk/src/org/korsakow/player

Files:

• ApplicationBase.as (modified) (4 diffs)
• ConfigKeys.as (modified) (1 diff)
• Domain.as (modified) (1 diff)
• EmbedApplication.as (modified) (1 diff)
• IKorsakowApplication.as (modified) (1 diff)
• engine/Engine.as (modified) (1 diff)

flash_player/trunk/src/org/korsakow/player/ApplicationBase.as

@@ -32 +32 @@
                 protected var Splash:Class;
                 
-                public static const DefaultProjectPath:String = "project.xml";
+                public static const DefaultProjectFile:String = "project.xml";
                 protected var domain:Domain;
                 protected var _project:Project;
-                protected var _projectPath:String;
+                protected var _basePath:String;
                 protected var fontManager:FontManager;
                 protected var soundManager:SoundManager;
@@ -61 +61 @@
                                 }
                         }
+                        if (_config.has(ConfigKeys.BASE_PATH)) {
+                                _basePath = _config.get(ConfigKeys.BASE_PATH);
+                                if (_basePath.charAt(_basePath.length-1) != '/')
+                                        _basePath += '/';
+                        } else
+                                _basePath = './';
+                        Debug.log("BasePath="+_basePath);
                         initInputMap();
                         
@@ -72 +79 @@
                         return _project;
                 }
-                public function get projectPath():String
-                {
-                        return _projectPath;
+                public function get basePath():String
+                {
+                        return _basePath;
                 }
                 /**
@@ -169 +176 @@
                 {
                         stopApplication();
-                        loadProject(_projectPath);
-                }
-                public function loadProject(dataPath:String=null):void
-                {
-                        if (dataPath==null) {
-                                if (_config.has(ConfigKeys.DATA_PATH))
-                                        dataPath = _config.getString(ConfigKeys.DATA_PATH);
-                                else
-                                        dataPath = DefaultProjectPath;
-                        }
-        
+                        loadDefaultProject();
+                }
+                public function loadDefaultProject():void
+                {
+                        loadProject(_basePath + DefaultProjectFile);
+                }
+                public function loadProject(dataPath:String):void
+                {
                         fontManager = new FontManager();
                         soundManager = new SoundManager();
                         
-                        _projectPath = dataPath;
                         domain = new Domain();
                         domain.addEventListener(Event.COMPLETE, onDomainLoadComplete);

flash_player/trunk/src/org/korsakow/player/ConfigKeys.as

@@ -4 +4 @@
         {
                 public static const REQUIRE_VERSION:String = "requireVersion";
-                public static const DATA_PATH:String = "dataPath";
+                public static const BASE_PATH:String = "basePath";
         }
 }

flash_player/trunk/src/org/korsakow/player/Domain.as

@@ -139 +139 @@
                 try {
                         var request:URLRequest = new URLRequest(source);
-                        Debug.log("Domain.load", request.url);
+                        Debug.log("Domain.load", ""+request.url);
                         domainLoader.load(request);
                 } catch (e:*) {

flash_player/trunk/src/org/korsakow/player/EmbedApplication.as

@@ -35 +35 @@
                         super(view);
 //                      AssetUtil.addAssetLoadListener(new Splash(), ShowSplashScreenAction.hook(this, loadProject));
-                        loadProject();
+                        loadDefaultProject();
                 }
                 override public function startApplication():void

flash_player/trunk/src/org/korsakow/player/IKorsakowApplication.as

@@ -12 +12 @@
                 function get inputMap():InputMap;
                 function get project():IProject;
-                function get projectPath():String;
+                function get basePath():String;
                 function startApplication():void;
                 function stopApplication():void;
-                function loadProject(path:String=null):void;
+                function loadProject(path:String):void;
                 function reloadProject():void;
                 function showErrorDialog(message:String, title:String='Error'):void;

flash_player/trunk/src/org/korsakow/player/engine/Engine.as

@@ -594 +594 @@
                 public function resolveFilename(filename:String):String
                 {
-                        return filename;
+                        return _app.basePath + filename;
                 }