fixed opengl context issue when accesing in the create project thread

Author: bladecoder

CHANGELOG

@@ -1,3 +1,6 @@
+[0.3.1]
+- COMPOSER: Fixed accessing opengl context issue when creating project in the new thread.
+
 [0.3.0]
 - ENGINE: Action refactoring. WARNING: Names have changed. All previous games are not compatible.
 - ENGINE: New DebugScreen (Work in progress)

adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java

@@ -85,6 +85,12 @@ public class ScnWidget extends Widget {
 	private WalkZoneWindow walkZoneWindow;
 
 	private boolean showWalkZone;
+	
+	/**
+	 * The NOTIFY_PROJECT_LOADED listener is called from other thread.
+	 * This flag is to recreate the scene in the OpenGL thread. 
+	 */
+	private boolean projectLoadedFlag = false;
 
 	public ScnWidget(Skin skin) {
 		bigFont = skin.get("big-font", BitmapFont.class);
@@ -107,23 +113,19 @@ public void propertyChange(PropertyChangeEvent e) {
 						+ e.getPropertyName());
 
 				if (e.getPropertyName().equals(Project.NOTIFY_SCENE_SELECTED)) {
-					setSelectedScene(Ctx.project.getSelectedScene());
+					if(!projectLoadedFlag)
+						setSelectedScene(Ctx.project.getSelectedScene());
 				} else if (e.getPropertyName().equals(
 						Project.NOTIFY_ACTOR_SELECTED)) {
-					setSelectedActor(Ctx.project.getSelectedActor());
+					if(!projectLoadedFlag)
+						setSelectedActor(Ctx.project.getSelectedActor());
 				} else if (e.getPropertyName().equals(
 						Project.NOTIFY_FA_SELECTED)) {
-					setSelectedFA(Ctx.project.getSelectedFA());
+					if(!projectLoadedFlag)
+						setSelectedFA(Ctx.project.getSelectedFA());
 				} else if (e.getPropertyName().equals(
 						Project.NOTIFY_PROJECT_LOADED)) {
-					if (scn != null) {
-						scn.dispose();
-						EngineAssetManager.getInstance().dispose();
-						scn = null;
-					}
-
-					EngineAssetManager.createEditInstance(Ctx.project
-							.getProjectDir().getAbsolutePath() + Project.ASSETS_PATH, Ctx.project.getWorld().getWidth(), Ctx.project.getWorld().getHeight());
+					projectLoadedFlag = true;
 				}
 			}
 		});
@@ -195,6 +197,23 @@ else if (((Element) e.getNewValue()).getTagName()
 
 	@Override
 	public void act(float delta) {
+		if(projectLoadedFlag) {
+			projectLoadedFlag = false;
+			
+			if (scn != null) {
+				scn.dispose();
+				EngineAssetManager.getInstance().dispose();
+				scn = null;
+			}
+
+			EngineAssetManager.createEditInstance(Ctx.project
+					.getProjectDir().getAbsolutePath() + Project.ASSETS_PATH, Ctx.project.getWorld().getWidth(), Ctx.project.getWorld().getHeight());
+			
+			setSelectedScene(Ctx.project.getSelectedScene());
+			setSelectedActor(Ctx.project.getSelectedActor());
+			setSelectedFA(Ctx.project.getSelectedFA());
+		}
+		
 		if (scn != null && animation && !loading && !loadingError) {
 			faRenderer.update(delta);
 			scn.update(delta);

adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java

@@ -94,15 +94,15 @@ private void createProject(Stage stage) {
 
 			Ctx.project.loadProject(new File(location.getText() + "/"
 					+ projectName.getText()));
+			
+			Ctx.msg.show(stage, "Project successfully created", 3);
 		} catch (Exception e) {
 			String msg = "Something went wrong while creating project.\n\n"
 					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(stage, msg, 2);
+			Ctx.msg.show(stage, msg, 3);
 			EditorLogger.error(msg);
 			return;
 		}
-		
-		Ctx.msg.show(stage, "Project successfully created", 3);
 	}
 
 	@Override

adventure-composer/src/main/resources/versions.properties

@@ -1,4 +1,4 @@
-version=0.3.0
+version=0.3.1
 libgdxVersion=1.3.1
 roboVMVersion=0.0.14
 buildToolsVersion=20.0.0

build.gradle

@@ -2,7 +2,7 @@ allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
-    version = '0.3.0'
+    version = '0.3.1'
 
     ext {
         gdxVersion = '1.3.1'