gdx-studio

git clone https://pyrossh.dev/repos/gdx-studio.git

An IDE for creating Games using libgdx and Java supported on all platforms Android, iOS, Desktop

a9b2a64a — pyros2097

v0.7.1

Files changed (94) hide show

.classpath +2 -5
Panel/AndroidManifest.xml +0 -24
Panel/ScenePanel.java +0 -539
Panel/proguard.cfg +0 -40
README.md +198 -3
Stage/Actions3d.java +0 -1414
Stage/Actor3d.java +0 -361
Stage/Group3d.java +0 -146
Stage/Scene.java +0 -80
Stage/Scene3d.java +0 -5
Stage/SpriteChar.java +0 -11
Stage/Stage.java +0 -1272
Stage/Stage3d.java +0 -488
Type/EffectType.java +0 -10
Type/GestureType.java +0 -19
Type/MovedListener.java +0 -3
Type/OnEventType.java +0 -5
Type/TransitionType.java +0 -3
icon/background.png +0 -0
icon/style.png +0 -0
shots/shot1.png +0 -0
shots/shot2.png +0 -0
shots/shot3.png +0 -0
shots/shot4.png +0 -0
shots/shot5.png +0 -0
shots/shot6.png +0 -0
{IDE → src/gdxstudio}/Content.java +16 -24
{IDE → src/gdxstudio}/Editor.java +9 -8
{IDE → src/gdxstudio}/Export.java +22 -16
{IDE → src/gdxstudio}/Frame.java +24 -12
IDE/Main.java → src/gdxstudio/GdxStudio.java +6 -1
{IDE → src/gdxstudio}/Icon.java +4 -1
src/gdxstudio/SceneEditor.java +263 -0
{IDE → src/gdxstudio}/SearchBar.java +1 -0
{IDE → src/gdxstudio}/StatusBar.java +22 -4
{IDE → src/gdxstudio}/Style.java +27 -14
{IDE → src/gdxstudio}/ToolBar.java +54 -65
{IDE → src/gdxstudio}/Update.java +4 -3
{Panel → src/gdxstudio/panel}/ActorPanel.java +39 -14
{Panel → src/gdxstudio/panel}/AssetPanel.java +11 -48
{Panel → src/gdxstudio/panel}/BaseList.java +10 -8
{Panel → src/gdxstudio/panel}/BaseTable.java +34 -5
{Panel → src/gdxstudio/panel}/ConsolePanel.java +38 -7
src/gdxstudio/panel/DPanel.java +30 -0
{Panel → src/gdxstudio/panel}/DashPanel.java +16 -2
{Panel → src/gdxstudio/panel}/EffectPanel.java +9 -1
{Panel → src/gdxstudio/panel}/EventPanel.java +12 -5
src/gdxstudio/panel/MapPanel.java +16 -0
{Panel → src/gdxstudio/panel}/OptionsPanel.java +60 -31
{Panel → src/gdxstudio/panel}/ProjectPanel.java +6 -101
src/gdxstudio/panel/ProjectSettingsPanel.java +121 -0
{Panel → src/gdxstudio/panel}/PropertyPanel.java +23 -27
{Panel → src/gdxstudio/panel}/ReplacePanel.java +1 -0
{Panel → src/gdxstudio/panel}/SceneEffectPanel.java +42 -31
src/gdxstudio/panel/ScenePanel.java +274 -0
{Panel → src/gdxstudio/panel}/SceneTemplate.txt +11 -0
{Panel → src/gdxstudio/panel}/StudioPanel.java +96 -30
{Panel → src/gdxstudio/panel}/TablePanel.java +5 -1
{Panel → src/gdxstudio/panel}/WidgetPanel.java +45 -11
{Parser → src/gdxstudio/parser}/Java.g4 +0 -0
{Parser → src/gdxstudio/parser}/Java.tokens +0 -0
{Parser → src/gdxstudio/parser}/JavaBaseListener.java +1 -0
{Parser → src/gdxstudio/parser}/JavaLexer.java +1 -0
{Parser → src/gdxstudio/parser}/JavaLexer.tokens +0 -0
{Parser → src/gdxstudio/parser}/JavaListener.java +1 -0
{Parser → src/gdxstudio/parser}/JavaParser.java +1 -0
{Stage → src/scene2d}/Asset.java +50 -41
src/scene2d/Camera.java +284 -0
{Stage → src/scene2d}/Config.java +2 -19
{Stage → src/scene2d}/Effect.java +45 -103
src/scene2d/EffectType.java +19 -0
{Type → src/scene2d}/EventType.java +1 -0
{Stage → src/scene2d}/ImageJson.java +3 -2
{Type → src/scene2d}/InterpolationType.java +1 -0
{Stage → src/scene2d}/Map.java +7 -6
{Stage → src/scene2d}/MapActor.java +2 -53
{Stage → src/scene2d}/Net.java +1 -0
src/scene2d/Scene.java +921 -0
{Stage → src/scene2d}/Serializer.java +19 -14
{Stage → src/scene2d}/Sprite.java +2 -1
Stage/MainActivity.java → src/scene2d/android/Main.java +9 -7
src/scene2d/desktop/Main.java +38 -0
test/config +5 -5
test/scene +44 -48
test/source/BasicDemo.java +35 -27
test/source/Game.java +36 -31
test/source/Game3d.java +56 -4
test/source/GameOver.java +16 -13
test/source/GameWin.java +16 -13
test/source/Menu.java +16 -13
test/source/Options.java +27 -20
test/source/Splash.java +21 -16
test/source/TicTacToe.java +26 -22
test/test.apk +0 -0

.classpath CHANGED Viewed

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="Panel"/>
-	<classpathentry kind="src" path="Stage"/>
-	<classpathentry kind="src" path="IDE"/>
+	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="Type"/>
-	<classpathentry kind="src" path="Parser"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libs/gdx-backend-lwjgl-natives.jar"/>
 	<classpathentry kind="lib" path="libs/gdx-backend-lwjgl.jar"/>
@@ -18,6 +14,7 @@
 	<classpathentry kind="lib" path="libs/antlr.jar"/>
 	<classpathentry kind="lib" path="libs/ecj.jar"/>
 	<classpathentry kind="lib" path="libs/weblaflite.jar"/>
+	<classpathentry kind="lib" path="libs/scene3d.jar"/>
 	<classpathentry kind="src" path="theme"/>
 	<classpathentry kind="src" path="icon"/>
 	<classpathentry kind="src" path="src_libs"/>

Panel/AndroidManifest.xml DELETED Viewed

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pyros.main"
-    android:versionCode="1"
-    android:versionName="1.0" >
-    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="17" />
-    <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
-        <activity
-            android:name="sky.warsong.main.MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

Panel/ScenePanel.java DELETED Viewed

@@ -1,539 +0,0 @@
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.Timer;
-import javax.swing.event.ListSelectionEvent;
-import web.laf.lite.widget.CenterPanel;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.EventListener;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.ui.List;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Timer.Task;
-final public class ScenePanel extends BaseList {
-	private static final long serialVersionUID = 1L;
-	public static JComboBox<String> stateComboBox = BaseTable.createComboBox("Scenes", "Maps", "Actors");
-	private static JButton addscene, updown ,delete, resume, pause;
-	private static SceneState currentState = SceneState.SceneEditor;
-	private final Timer saveTimer = new Timer(10000, new ActionListener(){
-		@Override
-		public void actionPerformed(ActionEvent arg0) {
-			save();
-		}
-	});
-	public ScenePanel(){
-		super("Scenes", true);
-		saveTimer.start();
-		Serializer.registerSerializer(SceneEditor.class, new Serializer.SceneSerializer());
-		initToolBar();
-		add(scrollPane);
-		stateComboBox.addItemListener(new ItemListener(){
-			@Override
-			public void itemStateChanged(ItemEvent e) {
-				clear();
-				switch(stateComboBox.getSelectedIndex()){
-					case 0: header.setText("SCENES");break;
-					case 1: header.setText("MAPS");break;
-					case 2: header.setText("ACTORS");break;
-				}
-				update();
-			}
-	    });
-	}
-	void initToolBar(){
-		JPanel tools = Style.createButtonToolBarPanel();
-		addscene = Style.createToolButton("New Scene", "newfile", this);
-		updown = Style.createToolButton("ScenePriority", "updown", this);
-		delete = Style.createToolButton("Delete", "trash", this);
-		resume = Style.createToolButton("Resume", "resume", this);
-		pause = Style.createToolButton("Pause", "pause", this);
-		pause.setEnabled(false);
-		tools.add(addscene);
-		tools.add(updown);
-		tools.add(delete);
-		tools.add(resume);
-		tools.add(pause);
-		stateComboBox.setPreferredSize(new Dimension(65, 17));
-		tools.add(new CenterPanel(stateComboBox, false, true));
-		add(tools);
-	}
-	public void update(){
-		lock();
-		listModel.clear();
-		for(String s: Scene.scenesMap.keys())
-			listModel.addElement(s);
-		if(Content.sceneFileExists()){
-			if(listModel.contains(Content.getSceneFile()))
-				list.setSelectedIndex(listModel.indexOf(Content.getSceneFile()));
-		}
-		if(!Content.sceneFileExists())
-			if(listModel.get(0) != null || !listModel.get(0).isEmpty()){
-				Content.setSceneFile(listModel.get(0));
-				list.setSelectedIndex(0);
-			}
-		Frame.eventPanel.update();
-		classPath = new File(Content.getProject()+"bin");
-		unlock();
-	}
-	private void createSceneFile(){
-		String text = JOptionPane.showInputDialog(Frame.getInstance(), "Create a New Scene", "New Scene",
-				JOptionPane.OK_CANCEL_OPTION);
-		if(text == null || text.isEmpty())
-			return;
-		String name = text.replace(".json", "").replace(".java", "");
-		name = Stage.capitalize(name);
-		if(listModel.contains(name)){
-			JOptionPane.showConfirmDialog(null, "Error: File already exists: "+name, "Error",
-					JOptionPane.OK_OPTION);
-			return;
-		}
-		else{
-			Export.writeFile("source/"+name+".java",
-					Export.readFileFromClassPath("SceneTemplate.txt").replace("$$$", name));
-			listModel.addElement(name);
-			Scene.scenesMap.put(name, "");
-			Frame.eventPanel.update();
-		}
-		list.setSelectedIndex(listModel.indexOf(name));
-		SceneEditor.isDirty = true;
-		save();
-	}
-	@Override
-	public void actionPerformed(ActionEvent event) {
-		switch(((JButton)event.getSource()).getToolTipText()){
-			case "New Scene":
-				createSceneFile();
-				break;
-			case "ScenePriority":
-				int sceneindex = list.getSelectedIndex();
-				if(sceneindex+1 < listModel.size()){
-					lock();
-					String selected = listModel.getElementAt(sceneindex);
-					String selectedValue = Scene.scenesMap.getValueAt(sceneindex);
-					String down = listModel.getElementAt(sceneindex+1);
-					String downValue = Scene.scenesMap.getValueAt(sceneindex+1);
-					/* Changing the model of List */
-					listModel.setElementAt(selected, sceneindex+1);
-					listModel.setElementAt(down, sceneindex);
-					/* Changing the sceneMap of Stage */
-					Scene.scenesMap.setKey(sceneindex+1, selected);
-					Scene.scenesMap.setValue(sceneindex+1, selectedValue);
-					Scene.scenesMap.setKey(sceneindex, down);
-					Scene.scenesMap.setValue(sceneindex, downValue);
-					list.setSelectedIndex(sceneindex+1);
-					unlock();
-				}
-				break;
-			case "Delete":
-				int confirm = JOptionPane.showConfirmDialog(null,
-						"Are you Sure you want to delete the Scene?", "Delete Scene",
-						JOptionPane.YES_NO_OPTION);
-				if(confirm == JOptionPane.YES_OPTION){
-					lock();
-					Export.deleteFile("source/"+list.getSelectedValue()+".java");
-					Export.deleteFile("bin/"+list.getSelectedValue()+".class");
-					Scene.scenesMap.removeKey(list.getSelectedValue());
-					int index = listModel.indexOf(list.getSelectedValue())-1;
-					if(index != -1){
-						Content.setSceneFile(listModel.elementAt(index));
-						Content.editor.load();
-						if(Content.currentView.equals("Editor"))
-							Content.toggleView(1);
-					}
-					listModel.removeElement(list.getSelectedValue());
-					Frame.eventPanel.update();
-					list.setSelectedValue(Content.getSceneFile(), true);
-					showStudio();
-					SceneEditor.isDirty = true;
-					save();
-					unlock();
-				}
-				break;
-			case "Resume":
-				save();
-				currentState = SceneState.GameRunning;
-				list.setEnabled(false);
-				addscene.setEnabled(false);
-				updown.setEnabled(false);
-				delete.setEnabled(false);
-				resume.setEnabled(false);
-				pause.setEnabled(true);
-				Frame.sceneEffectPanel.disable();
-				Frame.propertyPanel.disable();
-				Frame.effectPanel.disable();
-				Frame.eventPanel.disable();
-				Frame.widgetPanel.disable();
-				Content.toggleView(2);
-				runGame();
-				break;
-			case "Pause":
-				currentState = SceneState.SceneEditor;
-				Stage.cl = null;
-				Stage.debug = true;
-				list.setEnabled(true);
-				addscene.setEnabled(true);
-				updown.setEnabled(true);
-				delete.setEnabled(true);
-				resume.setEnabled(true);
-				pause.setEnabled(false);
-				Frame.sceneEffectPanel.enable();
-				Frame.propertyPanel.enable();
-				Frame.effectPanel.enable();
-				Frame.eventPanel.enable();
-				Frame.widgetPanel.enable();
-				Scene.scenesMap.put("SceneEditor", "");
-				Stage.setScene("SceneEditor");
-				Content.toggleView(2);
-				runStudio();
-				break;
-		}
-	}
-	@Override
-	public void valueChanged(ListSelectionEvent e) {
-		if (e.getValueIsAdjusting() == false) {
-			if(list.getSelectedValue() == null)
-				return;
-			if(resume.isEnabled())
-				runStudio();
-			Frame.actorPanel.setHeaderText(list.getSelectedValue());
-		}
-	}
-	public void runStudio(){
-		ConsolePanel.clear();
-		Content.editor.clearIcons();
-		Content.editor.save();
-		save();
-		Content.setSceneFile(list.getSelectedValue());
-		showStudio();
-		Content.editor.load();
-	}
-	public void showStudio(){
-		Frame.actorPanel.clear();
-		Stage.getRoot().clearChildren();
-		Stage.clearAllHud();
-		Stage.followActor(null);
-		Stage.resetCamera();
-		if(Content.sceneFileExists()){
-			//load(Content.getSceneFile());
-			Stage.getScene().load(Content.getSceneFile());
-			for(Actor child: Stage.getChildren()){
-				if(Stage.isValidActor(child)){
-					Frame.actorPanel.addActor(child.getName());
-					for(EventListener l: child.getListeners())
-						child.removeListener(l);
-				}
-			}
-		}
-		Frame.sceneEffectPanel.update();
-	}
-	private static File classPath = new File(Content.getProject()+"bin/");
-	public void runGame() {
-		try {
-			ConsolePanel.clear();
-			Frame.actorPanel.clear();
-			URL url = classPath.toURI().toURL();
-			URLClassLoader cl = URLClassLoader.newInstance(new URL[]{url});
-			Stage.cl = cl;
-			Stage.debug = false;
-			Stage.setScene(list.getSelectedValue());
-		} catch (MalformedURLException me) {
-			me.printStackTrace();
-		}
-	}
-	private void save(){
-		if(currentState != SceneState.SceneEditor)
-			return;
-		if(!SceneEditor.isDirty)
-			return;
-		Stage.getScene().save(Content.getSceneFile());
-		SceneEditor.isDirty = false;
-	}
-}
-enum SceneState{
-	SceneEditor, MapEditor, ActorEditor, GameRunning
-}
-class SceneEditor extends Scene {
-	public static Actor selectedActor = null;
-	public static boolean reloadAssets = false;
-	static AddField addField;
-	public SceneEditor(){
-		super();
-		if(reloadAssets){
-			Asset.loadBlocking();  // this is the first time this Scene is created by the Stage
-			Content.assetPanel.updateAsset();
-			com.badlogic.gdx.utils.Timer.schedule(new Task(){
-				@Override
-				public void run() {
-					Frame.scenePanel.showStudio();
-					Scene.scenesMap.removeKey("SceneEditor");
-					Frame.scenePanel.update();
-				}
-			}, 1f);
-			reloadAssets = false;
-			addField = new AddField();
-		}
-		else{
-			Frame.scenePanel.showStudio();
-			Scene.scenesMap.removeKey("SceneEditor");
-			Stage.addActor(this);
-		}
-		Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-	}
-	public static void doClick(Actor actor){
-		addField.remove();
-		Frame.actorPanel.lock();
-		Frame.propertyPanel.clear();
-		Frame.effectPanel.clear();
-		Frame.eventPanel.clear();
-		selectedActor = actor;
-		Stage.outline(actor);
-		Frame.actorPanel.list.setSelectedIndex(Frame.actorPanel.indexOf(actor.getName()));
-		StatusBar.updateSelected(actor.getName());
-		Frame.dashPanel.update();
-		Frame.propertyPanel.update();
-		Frame.effectPanel.update();
-		Frame.eventPanel.update();
-		Frame.actorPanel.unlock();
-		if(selectedActor instanceof List || selectedActor instanceof SelectBox){
-			addField.setPosition(actor.getX(), actor.getY() - addField.getHeight());
-			Stage.addActor(addField);
-		}
-	}
-	@Override
-	public void onClick(Actor actor) {
-		doClick(actor);
-	}
-	boolean dragging;
-	int edge;
-	float startX, startY, lastX, lastY;
-	public static boolean isDirty = false;
-	@Override
-	public void onTouchDown(Actor actor) {
-		if (Stage.button == 0) {
-			edge = 0;
-			float x = Stage.mouse.x;
-			float y = Stage.mouse.y;
-			if (x > actor.getX() + actor.getWidth() - 10) edge |= Align.right;
-			if (y > actor.getY() + actor.getHeight() - 10) edge |= Align.top;
-			if (x < actor.getX() + 20 && y < actor.getY() + 20) edge = Align.left;
-			dragging = edge != 0;
-			startX = x;
-			startY = y;
-			lastX = x;
-			lastY = y;
-		}
-	}
-	@Override
-	public void onTouchUp() {
-		dragging = false;
-		Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-	}
-	@Override
-	public void onDragged() {
-		if(Stage.isValidActor(selectedActor)){
-			if(!dragging){
-				selectedActor.setPosition(Stage.mouse.x, Stage.mouse.y);
-				Frame.propertyPanel.updateProperty("X", ""+selectedActor.getX(), 0);
-				Frame.propertyPanel.updateProperty("Y", ""+selectedActor.getY(), 0);
-				StatusBar.updateXY(Stage.mouse.x, Stage.mouse.y);
-			}
-			else
-			{
-				float x = Stage.mouse.x;
-				float y = Stage.mouse.y;
-				float width = selectedActor.getWidth(), height = selectedActor.getHeight();
-				float windowX = selectedActor.getX(), windowY = selectedActor.getY();
-				if ((edge & Align.right) != 0) {
-					width += x - lastX;
-				}
-				if ((edge & Align.top) != 0) {
-					height += y - lastY;
-				}
-				if ((edge & Align.top) != 0 && (edge & Align.right) != 0) {
-					width += x - lastX;
-					height += y - lastY;
-				}
-				if (edge == Align.left){
-					float rot = Stage.getAngle(selectedActor.getX()+selectedActor.getOriginX(),
-							selectedActor.getY()+selectedActor.getOriginY(), x, y)
-							- selectedActor.getRotation();
-					selectedActor.rotate(rot);
-				}
-				lastX = x;
-				lastY = y;
-				selectedActor.setBounds(Math.round(windowX), Math.round(windowY), Math.round(width), Math.round(height));
-				Frame.propertyPanel.updateProperty("Width", ""+width, 0);
-				Frame.propertyPanel.updateProperty("Height", ""+height, 0);
-			}
-			SceneEditor.isDirty = true;
-		}
-	}
-	@Override
-	public void onGesture(GestureType type) {
-	}
-	private boolean isHand = true;
-	private boolean isRight = false;
-	private boolean isTop = false;
-	@Override
-	public void act(float delta){
-		if(Stage.isValidActor(selectedActor)){
-			isRight = false;
-			isTop = false;
-			//Stage.log("my"+Stage.mouse.y+"top"+selectedActor.getTop());
-			if (Stage.mouse.x > selectedActor.getRight() - 10 && Stage.mouse.x < selectedActor.getRight()) {
-				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
-				isHand = false;
-				isRight = true;
-			}
-			if(Stage.mouse.y > selectedActor.getTop() - 10 && Stage.mouse.y < selectedActor.getTop()){
-				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR));
-				isHand = false;
-				isTop = true;
-			}
-			if (isRight && isTop) {
-				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.NE_RESIZE_CURSOR));
-				isHand = false;
-			}
-			if (!isRight && !isTop){
-				if(!isHand){
-					Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-					isHand = true;
-				}
-			}
-		}
-	}
-	@Override
-	public void onKeyTyped(char key) {};
-	@Override
-	public void onKeyUp(int keycode){};
-	@Override
-	public void onKeyDown(int keycode){};
-	@Override
-	public void onPause(){};
-	@Override
-	public void onResume(){};
-	@Override
-	public void onDispose(){};
-}
-class AddField extends Table {
-	TextField tf;
-	TextButton addBtn;
-	TextButton removeBtn;
-	public AddField(){
-		super(Asset.skin);
-		setBackground(Asset.skin.getDrawable("dialogDim"));
-		tf = new TextField("", Asset.skin);
-		addBtn = new TextButton("Add", Asset.skin);
-		removeBtn = new TextButton("Remove", Asset.skin);
-		add(tf);
-		add(addBtn);
-		add(removeBtn);
-		pack();
-		addBtn.addListener(new ClickListener(){
-			@Override
-	    	public void clicked(InputEvent event, float x, float y){
-	    		super.clicked(event, x, y);
-	    		if(!tf.getText().isEmpty()){
-	    			if(SceneEditor.selectedActor instanceof List){
-	    				List list = (List) SceneEditor.selectedActor;
-	    				Array<String> arr = new Array<String>(list.getItems());
-	    				arr.add(tf.getText());
-	    				list.setItems(arr.toArray());
-	    				list.pack();
-	    				AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
-	    			}
-	    			if(SceneEditor.selectedActor instanceof SelectBox){
-	    				SelectBox list = (SelectBox) SceneEditor.selectedActor;
-	    				Array<String> arr = new Array<String>(list.getItems());
-	    				arr.add(tf.getText());
-	    				list.setItems(arr.toArray());
-	    				list.pack();
-	    				AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
-	    			}
-	    		}
-			}
-		});
-		removeBtn.addListener(new ClickListener(){
-			@Override
-	    	public void clicked(InputEvent event, float x, float y){
-	    		super.clicked(event, x, y);
-	    		if(SceneEditor.selectedActor instanceof List){
-		    		List list = (List) SceneEditor.selectedActor;
-		    		if(list.getItems().length == 0)
-		    			return;
-		    		Array<String> arr = new Array<String>(list.getItems());
-		    		list.setSelectedIndex(list.getItems().length-1);
-		    		arr.removeIndex(list.getSelectedIndex());
-		    		list.setItems(arr.toArray());
-		    		list.pack();
-		    		AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
-	    		}
-	    		if(SceneEditor.selectedActor instanceof SelectBox){
-	    			SelectBox list = (SelectBox) SceneEditor.selectedActor;
-		    		if(list.getItems().length == 0)
-		    			return;
-		    		Array<String> arr = new Array<String>(list.getItems());
-		    		list.setSelection(list.getItems().length-1);
-		    		arr.removeIndex(list.getSelectionIndex());
-		    		list.setItems(arr.toArray());
-		    		list.pack();
-		    		AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
-	    		}
-			}
-		});
-	}
-}

Panel/proguard.cfg DELETED Viewed

@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
--keepclasseswithmembernames class * {
-    native <methods>;
-}
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}

README.md CHANGED Viewed

@@ -6,7 +6,7 @@ Texture Packer, SceneEditor, MapEditor, ActorEditor, ImagingTools are already bu
 It also has a powerful Game Framework based on libGDX inbuilt which allows the game coder
 to concentrate on the logic of the game and not bother about setting up assets or configuration.
 It has Automatic Asset Loading including Atlas, TextureRegions, BitmapFonts, Music, Sound.
-It has the Latest Nightly Version of libGdx inside it so you don't need to download the libGdx at all,
+It has the Latest Stable Version of libGdx inside it so you don't need to download the libGdx at all,
 when exporting your game to jar for desktop it automatically loads these libraries into it.
 >**Disclaimer**  This is not an official libdgx project so don't ask them for bug fixes
@@ -43,7 +43,41 @@ for different platforms and exporting is done automatically.(android and ios not
 <p>You can edit your scenes and add logic to your game and at the same time see the outcome in the studio.
 Your source files are automatically compiled and loaded into the class loader and displayed in the studio.
 So your don't need to follow the monotonous approach compile->build->run exe. This saves a lot of time.<p>
+Using
+------
+```java
+ //This is our first Scene and it shows the libgdx logo until all the assets are loaded
+    //then it automatically switches to the Menu scene
+    public class  Splash extends Scene {
+		public Splash() {
+			splashDuration = 5f; // This will make my splash scene to wait 5 seconds after assets are all loaded
+			final Texture bg1 = new Texture("splash/libgdx.png");
+			final Image imgbg1 = new Image(bg1);
+			imgbg1.setFillParent(true);
+			addActor(imgbg1);
+	    }
+   }
+    //This is Scene gets called once the assets are loaded
+    public class Menu extends Scene {
+		public Menu() {
+			//create some actors
+			// if you used sink studio and create a scene like Menu.json then
+			// it will automatically call load("Menu") it will populate your scene after parsing the json file
+			//you can access these objects like this
+			TextButton btn = (TextButton) findActor("TextButton1");
+			Image img = (Image) findActor("Image5");
+			// these actors are loaded from the json file and are give names which allows
+			// easy access to them
+		}
+	}
+```
 Todo
 -----
 1. MapEditor
@@ -63,4 +97,165 @@ Thanks to all these awesome frameworks
 [EclipseCompiler](http://download.eclipse.org/eclipse/downloads/)
 [ANTLR](http://www.antlr.org/)
 [ProGuard](http://proguard.sourceforge.net)
+Screenshots
+-----------
+![alt text](https://github.com/pyros2097/GdxStudio/raw/master/shots/shot2.png)
+![alt text](https://github.com/pyros2097/GdxStudio/raw/master/shots/shot3.png)
+![alt text](https://github.com/pyros2097/GdxStudio/raw/master/shots/shot4.png)
+![alt text](https://github.com/pyros2097/GdxStudio/raw/master/shots/shot5.png)
+![alt text](https://github.com/pyros2097/GdxStudio/raw/master/shots/shot6.png)
+Documentation
+-------------
+Scene
+-----
+<p>
+It consists of a single Stage2d, Stage3d, Camera2d, and Camera3d which are all initialized based on the config file.
+The root of the stage can be accessed in a statically {@link Scene#getRoot()} and methods related to camera like moveTo, moveBy,
+are also accessed the same way.<br>
+It has extra things like stateTime, gameUptime, pauseState<br>
+It has automatic asset unloading and disposing and you can use {@link #exit()} to quit your game safely
+Note: Your TMX maps have to be unloaded manually as they can be huge resources needing to be freed early.
+It has static methods which can be used for panning the camera using mouse, keyboard, drag.. etc.
+It can also automatically follow a actor by using followActor(Actor actor)<br>
+This class will register all your scenes based on your scene.json file and then you can switch you scenes by using {@link #setScene}
+method with the sceneClassName.<br>
+All your assets are loaded in the background(asynchronously) in the first scene and then automatically
+the next scene in the list is set.
+You can stop the stage from switching to the next scene by setting Asset.loadAsynchronous = false in your first scene but then
+you have to load all the assets by using the blocking call Asset.loadBlocking()
+If you want to display your splash screen for more time after the assets have loaded then you can change
+Stage.splashDuration to the amount of time you want you splash screen to show. By default the splash screen's
+lifetime is finished once the assets are loaded and then the next scene is set.
+</p>
+Camera
+------
+```java
+/*
+ *  This is to set the offsets of camera position when following the actor
+ *  When the camera follows the actor its (x,y) position is set to actor's (x,y) position
+ *  based on followSpeed. The offsets are used to position the camera in such a way that the actor
+ *  doesn't need to be at the center of the camera always
+ */
+public static Rectangle followOffset;
+public static boolean usePan;
+public static boolean useDrag;
+/*
+ *  This sets the boundary of the camera till what position can it move or pan in the
+ *  directions left, right, top, down. This is to prevent is from panning overboard the game area.
+ *  Usually the bounds of the camera is like a rectangle. This must be calculated carefully
+ *  as the camera's position is based on its center.
+*/
+public static Rectangle bounds;
+/*
+ * Moves the camera to x,y over a time duration
+ */
+public void moveTo(float x, float y, float duration);
+/*
+ * Moves the camera by amountX, amountY over a time duration
+ */
+public static void moveBy (float amountX, float amountY, float duration);
+/*
+ * Moves the camera by amountX, amountY over a time duration and interpolation interp
+ */
+public static void moveBy (float amountX, float amountY, float dur, Interpolation interp);
+/*
+ * This makes the camera follow the actor once and only once. Once the camera reaches its
+ * target, it stops following the actor.
+ */
+public static void followActor(Actor actor);
+/*
+ * This makes the camera follow the actor continuously, even after the camera reaches its
+ * target, it keeps following the if the actor changes its position.
+ */
+public static void followActorContinuously(Actor actor);
+/*
+ * Sets the speed at which the camera follows the actor. By default it moves 1px for a duration of 1f
+ * so its speed is 1px/f. So reduce the duration to increase its speed.
+ * ex: setPanSpeed(0.5) will change its speed to 2px/f
+ * Here: f can/maybe also indicate seconds
+ */
+public static void setFollowSpeed(float duration);
+/*
+ * Sets the speed at which the camera pans. By default it moves 1px for a duration a 1f
+ * so its speed is 1px/f. So reduce the duration to increase its speed.
+ * ex: setPanSpeed(0.5) will change its speed to 2px/f
+ * Here: f can/maybe also indicate seconds
+ */
+public void setPanSpeed(float duration);
+/* If you want to make any elements/actors to move along with the camera
+ * like HUD's add them using this method */
+public static void addHud(Actor actor);
+/* If you want to any elements/actors which was a Hud the use this */
+public static void removeHud(Actor actor);
+/*
+ * Clears all hud's registerd with the camera
+ */
+public static void clearAllHud();
+/*
+ * Returns the x postion of the camera
+ */
+public static float getX();
+/*
+ * Returns the y postion of the camera
+ */
+public static float getY();
+```
+Asset
+-----
+<b>#Important </b> <br>
+All asset files must be lowercase only.. otherwise it causes problems with android <br>
+Automatic Asset Loading the directory Structure should be like this <br>
+This class automatically loads all the assets in the prescribed folders into the appropriate
+class types. All This can be accessed using an neat api.
+icon.png  --- your game icon to be displayed on the window<br>
+atlas/  --- all your Texture Atlas files .atlas and .png go here<br>
+font/  --- all your BitmapFont files .fnt and .png go here<br>
+music/  --- all your Music files .mp3 go here<br>
+sound/  --- all your Music files .mp3 go here<br>
+particle/  --- all your Particle files .part go here<br>
+map/  --- all your TMX map files along with tilesets go here<br>
+pack/  --- all your image files which are to be packed are to be stored here<br>
+ 					  so that they are automatically packed by the texture packer and stored in
+ 					  the atlas folder
+All the assets are read from their particular folders and an asset.json file is created with
+the filenames:
+ex: asset.json
+	{
+	  	"font": "arial.fnt, font1",
+  		"atlas": "image.atlas",
+  		"sound": "click.mp3,gg.mp3",
+  		"music": "title.mp3,"bg.mp3",
+	}
+```java
+//All assets are accessed this way, To load TextureRegion
+TextureRegion cat = Asset.tex("cat");
+//To load Animation
+Animation catAnim = Asset.anim("cat");
+BitmapFont font1 = Asset.font("font1");
+//The music and sound files are automatically cached and can be played by invoking:
+Asset.musicPlay("musicname");
+Asset.soundPlay("soundname");
+//The asset functions will return null for Font, TextureRegion and Animation if the asset cannot be found
+```

Stage/Actions3d.java DELETED Viewed

@@ -1,1414 +0,0 @@
-import com.badlogic.gdx.math.Interpolation;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Pool;
-import com.badlogic.gdx.utils.Pools;
-import com.badlogic.gdx.utils.Pool.Poolable;
-public class Actions3d {
-	/** Returns a new or pooled action of the specified type. */
-	static public <T extends Action3d> T action (Class<T> type) {
-		Pool<T> pool = Pools.get(type);
-		T action = pool.obtain();
-		action.setPool(pool);
-		return action;
-	}
-	static public AddAction addAction (Action3d action) {
-		AddAction addAction = action(AddAction.class);
-		addAction.setAction(action);
-		return addAction;
-	}
-	static public AddAction addAction (Action3d action, Actor3d targetActor) {
-		AddAction addAction = action(AddAction.class);
-		addAction.setTargetActor(targetActor);
-		addAction.setAction(action);
-		return addAction;
-	}
-	static public RemoveAction removeAction (Action3d action) {
-		RemoveAction removeAction = action(RemoveAction.class);
-		removeAction.setAction(action);
-		return removeAction;
-	}
-	static public RemoveAction removeAction (Action3d action, Actor3d targetActor) {
-		RemoveAction removeAction = action(RemoveAction.class);
-		removeAction.setTargetActor(targetActor);
-		removeAction.setAction(action);
-		return removeAction;
-	}
-	/** Moves the actor instantly. */
-	static public MoveToAction moveTo (float x, float y, float z) {
-		return moveTo(x, y, z, 0, null);
-	}
-	static public MoveToAction moveTo (float x, float y, float z, float duration) {
-		return moveTo(x, y, z, duration, null);
-	}
-	static public MoveToAction moveTo (float x, float y, float z ,float duration, Interpolation interpolation) {
-		MoveToAction action = action(MoveToAction.class);
-		action.setPosition(x, y, z);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	/** Moves the actor instantly. */
-	static public MoveByAction moveBy (float amountX, float amountY, float amountZ) {
-		return moveBy(amountX, amountY, amountZ, 0, null);
-	}
-	static public MoveByAction moveBy (float amountX, float amountY, float amountZ, float duration) {
-		return moveBy(amountX, amountY, amountZ, duration, null);
-	}
-	static public MoveByAction moveBy (float amountX, float amountY, float amountZ, float duration, Interpolation interpolation) {
-		MoveByAction action = action(MoveByAction.class);
-		action.setAmount(amountX, amountY, amountZ);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	/** Scales the actor instantly. */
-	static public ScaleToAction scaleTo (float x, float y, float z) {
-		return scaleTo(x, y, z, 0, null);
-	}
-	static public ScaleToAction scaleTo (float x, float y, float z, float duration) {
-		return scaleTo(x, y, z, duration, null);
-	}
-	static public ScaleToAction scaleTo (float x, float y, float z, float duration, Interpolation interpolation) {
-		ScaleToAction action = action(ScaleToAction.class);
-		action.setScale(x, y, z);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	/** Scales the actor instantly. */
-	static public ScaleByAction scaleBy (float amountX, float amountY, float amountZ) {
-		return scaleBy(amountX, amountY, amountZ, 0, null);
-	}
-	static public ScaleByAction scaleBy (float amountX, float amountY, float amountZ, float duration) {
-		return scaleBy(amountX, amountY, amountZ, duration, null);
-	}
-	static public ScaleByAction scaleBy (float amountX, float amountY, float amountZ, float duration, Interpolation interpolation) {
-		ScaleByAction action = action(ScaleByAction.class);
-		action.setAmount(amountX, amountY, amountZ);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	/** Rotates the actor instantly. */
-	static public RotateToAction rotateTo (float rotation) {
-		return rotateTo(rotation, 0, null);
-	}
-	static public RotateToAction rotateTo (float rotation, float duration) {
-		return rotateTo(rotation, duration, null);
-	}
-	static public RotateToAction rotateTo (float rotation, float duration, Interpolation interpolation) {
-		RotateToAction action = action(RotateToAction.class);
-		action.setRotation(rotation);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	/** Rotates the actor instantly. */
-	static public RotateByAction rotateBy (float rotationAmount) {
-		return rotateBy(rotationAmount, 0, null);
-	}
-	static public RotateByAction rotateBy (float rotationAmount, float duration) {
-		return rotateBy(rotationAmount, duration, null);
-	}
-	static public RotateByAction rotateBy (float rotationAmount, float duration, Interpolation interpolation) {
-		RotateByAction action = action(RotateByAction.class);
-		action.setAmount(rotationAmount);
-		action.setDuration(duration);
-		action.setInterpolation(interpolation);
-		return action;
-	}
-	static public VisibleAction show () {
-		return visible(true);
-	}
-	static public VisibleAction hide () {
-		return visible(false);
-	}
-	static public VisibleAction visible (boolean visible) {
-		VisibleAction action = action(VisibleAction.class);
-		action.setVisible(visible);
-		return action;
-	}
-	static public RemoveActorAction removeActor (Actor3d removeActor) {
-		RemoveActorAction action = action(RemoveActorAction.class);
-		action.setRemoveActor(removeActor);
-		return action;
-	}
-	static public DelayAction delay (float duration) {
-		DelayAction action = action(DelayAction.class);
-		action.setDuration(duration);
-		return action;
-	}
-	static public DelayAction delay (float duration, Action3d delayedAction) {
-		DelayAction action = action(DelayAction.class);
-		action.setDuration(duration);
-		action.setAction(delayedAction);
-		return action;
-	}
-	static public TimeScaleAction timeScale (float scale, Action3d scaledAction) {
-		TimeScaleAction action = action(TimeScaleAction.class);
-		action.setScale(scale);
-		action.setAction(scaledAction);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d action1) {
-		SequenceAction action = action(SequenceAction.class);
-		action.addAction(action1);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d action1, Action3d action2) {
-		SequenceAction action = action(SequenceAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d action1, Action3d action2, Action3d action3) {
-		SequenceAction action = action(SequenceAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d action1, Action3d action2, Action3d action3, Action3d action4) {
-		SequenceAction action = action(SequenceAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		action.addAction(action4);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d action1, Action3d action2, Action3d action3, Action3d action4, Action3d action5) {
-		SequenceAction action = action(SequenceAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		action.addAction(action4);
-		action.addAction(action5);
-		return action;
-	}
-	static public SequenceAction sequence (Action3d... actions) {
-		SequenceAction action = action(SequenceAction.class);
-		for (int i = 0, n = actions.length; i < n; i++)
-			action.addAction(actions[i]);
-		return action;
-	}
-	static public SequenceAction sequence () {
-		return action(SequenceAction.class);
-	}
-	static public ParallelAction parallel (Action3d action1) {
-		ParallelAction action = action(ParallelAction.class);
-		action.addAction(action1);
-		return action;
-	}
-	static public ParallelAction parallel (Action3d action1, Action3d action2) {
-		ParallelAction action = action(ParallelAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		return action;
-	}
-	static public ParallelAction parallel (Action3d action1, Action3d action2, Action3d action3) {
-		ParallelAction action = action(ParallelAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		return action;
-	}
-	static public ParallelAction parallel (Action3d action1, Action3d action2, Action3d action3, Action3d action4) {
-		ParallelAction action = action(ParallelAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		action.addAction(action4);
-		return action;
-	}
-	static public ParallelAction parallel (Action3d action1, Action3d action2, Action3d action3, Action3d action4, Action3d action5) {
-		ParallelAction action = action(ParallelAction.class);
-		action.addAction(action1);
-		action.addAction(action2);
-		action.addAction(action3);
-		action.addAction(action4);
-		action.addAction(action5);
-		return action;
-	}
-	static public ParallelAction parallel (Action3d... actions) {
-		ParallelAction action = action(ParallelAction.class);
-		for (int i = 0, n = actions.length; i < n; i++)
-			action.addAction(actions[i]);
-		return action;
-	}
-	static public ParallelAction parallel () {
-		return action(ParallelAction.class);
-	}
-	static public RepeatAction repeat (int count, Action3d repeatedAction) {
-		RepeatAction action = action(RepeatAction.class);
-		action.setCount(count);
-		action.setAction(repeatedAction);
-		return action;
-	}
-	static public RepeatAction forever (Action3d repeatedAction) {
-		RepeatAction action = action(RepeatAction.class);
-		action.setCount(RepeatAction.FOREVER);
-		action.setAction(repeatedAction);
-		return action;
-	}
-	static public RunnableAction run (Runnable runnable) {
-		RunnableAction action = action(RunnableAction.class);
-		action.setRunnable(runnable);
-		return action;
-	}
-	static public AfterAction after (Action3d action) {
-		AfterAction afterAction = action(AfterAction.class);
-		afterAction.setAction(action);
-		return afterAction;
-	}
-	public static class AddAction extends Action3d {
-		private Actor3d targetActor;
-		private Action3d action;
-		@Override
-		public boolean act (float delta) {
-			(targetActor != null ? targetActor : actor3d).addAction3d(action);
-			return true;
-		}
-		public Actor3d getTargetActor() {
-			return targetActor;
-		}
-		/** Sets the actor to add an action to. If null (the default), the {@link #getActor() actor} will be used. */
-		public void setTargetActor(Actor3d actor) {
-			this.targetActor = actor;
-		}
-		public Action3d getAction () {
-			return action;
-		}
-		public void setAction(Action3d action) {
-			this.action = action;
-		}
-		public void restart () {
-			if (action != null) action.restart();
-		}
-		@Override
-		public void reset () {
-			super.reset();
-			targetActor = null;
-			action = null;
-		}
-	}
-	/** Executes an action only after all other actions on the actor at the time this action was added have finished.
-	 * @author Nathan Sweet */
-	 public static class AfterAction extends DelegateAction {
-		private Array<Action3d> waitForActions = new Array<Action3d>(false, 4);
-		@Override
-		public void setActor3d(Actor3d actor3d) {
-			if (actor3d != null) waitForActions.addAll(actor3d.getActions3d());
-			super.setActor3d(actor3d);
-		}
-		@Override
-		public void restart () {
-			super.restart();
-			waitForActions.clear();
-		}
-		@Override
-		protected boolean delegate (float delta) {
-			Array<Action3d> currentActions = actor3d.getActions3d();
-			if (currentActions.size == 1) waitForActions.clear();
-			for (int i = waitForActions.size - 1; i >= 0; i--) {
-				Action3d action = waitForActions.get(i);
-				int index = currentActions.indexOf(action, true);
-				if (index == -1) waitForActions.removeIndex(i);
-			}
-			if (waitForActions.size > 0) return false;
-			return action.act(delta);
-		}
-	 }
-	 /** Delays execution of an action or inserts a pau
-	  *
-	  * se in a {@link SequenceAction}.
-	  * @author Nathan Sweet */
-	 public static class DelayAction extends DelegateAction {
-		 private float duration, time;
-		 public DelayAction () {
-		 }
-		 public DelayAction (float duration) {
-			 this.duration = duration;
-		 }
-		 @Override
-		 protected boolean delegate (float delta) {
-			 if (time < duration) {
-				 time += delta;
-				 if (time < duration) return false;
-				 delta = time - duration;
-			 }
-			 if (action == null) return true;
-			 return action.act(delta);
-		 }
-		 /** Causes the delay to be complete. */
-		 public void finish () {
-			 time = duration;
-		 }
-		 @Override
-		 public void restart () {
-			 super.restart();
-			 time = 0;
-		 }
-		 /** Gets the time spent waiting for the delay. */
-		 public float getTime () {
-			 return time;
-		 }
-		 /** Sets the time spent waiting for the delay. */
-		 public void setTime (float time) {
-			 this.time = time;
-		 }
-		 public float getDuration () {
-			 return duration;
-		 }
-		 /** Sets the length of the delay in seconds. */
-		 public void setDuration (float duration) {
-			 this.duration = duration;
-		 }
-	 }
-	 /** Base class for an action that wraps another action.
-	  * @author Nathan Sweet */
-	 abstract public static class DelegateAction extends Action3d {
-		 protected Action3d action;
-		 /** Sets the wrapped action. */
-		 public void setAction (Action3d action) {
-			 this.action = action;
-		 }
-		 public Action3d getAction () {
-			 return action;
-		 }
-		 abstract protected boolean delegate (float delta);
-		 @Override
-		 public final boolean act (float delta) {
-			 Pool pool = getPool();
-			 setPool(null); // Ensure this action can't be returned to the pool inside the delegate action.
-			 try {
-				 return delegate(delta);
-			 } finally {
-				 setPool(pool);
-			 }
-		 }
-		 @Override
-		 public void restart () {
-			 if (action != null) action.restart();
-		 }
-		 @Override
-		 public void reset () {
-			 super.reset();
-			 action = null;
-		 }
-		 @Override
-		 public void setActor3d (Actor3d actor3d) {
-			 if (action != null) action.setActor3d(actor3d);
-			 super.setActor3d(actor3d);
-		 }
-		 @Override
-		 public String toString () {
-			 return super.toString() + (action == null ? "" : "(" + action + ")");
-		 }
-	 }
-	 public static class FloatAction extends TemporalAction {
-		 private float start, end;
-		 private float value;
-		 /** Creates a FloatAction that transitions from 0 to 1. */
-		 public FloatAction () {
-			 start = 0;
-			 end = 1;
-		 }
-		 /** Creates a FloatAction that transitions from start to end. */
-		 public FloatAction (float start, float end) {
-			 this.start = start;
-			 this.end = end;
-		 }
-		 @Override
-		 protected void begin () {
-			 value = start;
-		 }
-		 @Override
-		 protected void update (float percent) {
-			 value = start + (end - start) * percent;
-		 }
-		 /** Gets the current float value. */
-		 public float getValue () {
-			 return value;
-		 }
-		 /** Sets the current float value. */
-		 public void setValue (float value) {
-			 this.value = value;
-		 }
-		 public float getStart () {
-			 return start;
-		 }
-		 /** Sets the value to transition from. */
-		 public void setStart (float start) {
-			 this.start = start;
-		 }
-		 public float getEnd () {
-			 return end;
-		 }
-		 /** Sets the value to transition to. */
-		 public void setEnd (float end) {
-			 this.end = end;
-		 }
-	 }
-	 /** An action that has an int, whose value is transitioned over time.
-	  * @author Nathan Sweet */
-	 public static class IntAction extends TemporalAction {
-		 private int start, end;
-		 private int value;
-		 /** Creates an IntAction that transitions from 0 to 1. */
-		 public IntAction () {
-			 start = 0;
-			 end = 1;
-		 }
-		 /** Creates an IntAction that transitions from start to end. */
-		 public IntAction (int start, int end) {
-			 this.start = start;
-			 this.end = end;
-		 }
-		 @Override
-		 protected void begin () {
-			 value = start;
-		 }
-		 @Override
-		 protected void update (float percent) {
-			 value = (int)(start + (end - start) * percent);
-		 }
-		 /** Gets the current int value. */
-		 public int getValue () {
-			 return value;
-		 }
-		 /** Sets the current int value. */
-		 public void setValue (int value) {
-			 this.value = value;
-		 }
-		 public int getStart () {
-			 return start;
-		 }
-		 /** Sets the value to transition from. */
-		 public void setStart (int start) {
-			 this.start = start;
-		 }
-		 public int getEnd () {
-			 return end;
-		 }
-		 /** Sets the value to transition to. */
-		 public void setEnd (int end) {
-			 this.end = end;
-		 }
-	 }
-	 /** Moves an actor to a relative position.
-	  * @author Nathan Sweet */
-	 public static class MoveByAction extends RelativeTemporalAction {
-		 private float amountX, amountY, amountZ;
-		 @Override
-		 protected void updateRelative (float percentDelta) {
-			 actor3d.translate(amountX * percentDelta, amountY * percentDelta, amountZ * percentDelta);
-		 }
-		 public void setAmount (float x, float y, float z) {
-			 amountX = x;
-			 amountY = y;
-			 amountZ = z;
-		 }
-		 public float getAmountX () {
-			 return amountX;
-		 }
-		 public void setAmountX (float x) {
-			 amountX = x;
-		 }
-		 public float getAmountY () {
-			 return amountY;
-		 }
-		 public void setAmountY (float y) {
-			 amountY = y;
-		 }
-		 public float getAmountZ () {
-			 return amountZ;
-		 }
-		 public void setAmountZ (float z) {
-			 amountZ = z;
-		 }
-	 }
-	 public static class MoveToAction extends TemporalAction {
-		 private float startX, startY, startZ;
-		 private float endX, endY, endZ;
-		 @Override
-		 protected void begin () {
-			 if(actor3d != null){
-				 startX = actor3d.getX();
-				 startY = actor3d.getY();
-				 startZ = actor3d.getZ();
-			 }
-		 }
-		 @Override
-		 protected void update (float percent) {
-			 if(actor3d != null){
-				 actor3d.setPosition(startX + (endX - startX) * percent, startY + (endY - startY) * percent,
-						 startZ + (endZ - startZ) * percent);
-			 }
-		 }
-		 public void setPosition (float x, float y, float z) {
-			 endX = x;
-			 endY = y;
-			 endZ = z;
-		 }
-		 public float getX () {
-			 return endX;
-		 }
-		 public void setX (float x) {
-			 endX = x;
-		 }
-		 public float getY () {
-			 return endY;
-		 }
-		 public void setY (float y) {
-			 endY = y;
-		 }
-		 public float getZ () {
-			 return endZ;
-		 }
-		 public void setZ (float z) {
-			 endZ = z;
-		 }
-	 }
-	 /** Executes a number of actions at the same time.
-	  * @author Nathan Sweet */
-	  public static class ParallelAction extends Action3d {
-		 Array<Action3d> actions = new Array<Action3d>(4);
-		 private boolean complete;
-		 public ParallelAction () {
-		 }
-		 public ParallelAction (Action3d action1) {
-			 addAction(action1);
-		 }
-		 public ParallelAction (Action3d action1, Action3d action2) {
-			 addAction(action1);
-			 addAction(action2);
-		 }
-		 public ParallelAction (Action3d action1, Action3d action2, Action3d action3) {
-			 addAction(action1);
-			 addAction(action2);
-			 addAction(action3);
-		 }
-		 public ParallelAction (Action3d action1, Action3d action2, Action3d action3, Action3d action4) {
-			 addAction(action1);
-			 addAction(action2);
-			 addAction(action3);
-			 addAction(action4);
-		 }
-		 public ParallelAction (Action3d action1, Action3d action2, Action3d action3, Action3d action4, Action3d action5) {
-			 addAction(action1);
-			 addAction(action2);
-			 addAction(action3);
-			 addAction(action4);
-			 addAction(action5);
-		 }
-		 @Override
-		 public boolean act (float delta) {
-			 if (complete) return true;
-			 complete = true;
-			 Pool pool = getPool();
-			 setPool(null); // Ensure this action can't be returned to the pool while executing.
-			 try {
-				 Array<Action3d> actions = this.actions;
-				 for (int i = 0, n = actions.size; i < n && actor3d != null; i++) {
-					 if (!actions.get(i).act(delta)) complete = false;
-					 if (actor3d == null) return true; // This action was removed.
-				 }
-				 return complete;
-			 } finally {
-				 setPool(pool);
-			 }
-		 }
-		 @Override
-		 public void restart () {
-			 complete = false;
-			 Array<Action3d> actions = this.actions;
-			 for (int i = 0, n = actions.size; i < n; i++)
-				 actions.get(i).restart();
-		 }
-		 @Override
-		 public void reset () {
-			 super.reset();
-			 actions.clear();
-		 }
-		 public void addAction (Action3d action) {
-			 actions.add(action);
-			 if (actor3d != null)
-				 action.setActor3d(actor3d);
-		 }
-		 @Override
-		 public void setActor3d(Actor3d actor) {
-			 Array<Action3d> actions = this.actions;
-			 for (int i = 0, n = actions.size; i < n; i++)
-				 actions.get(i).setActor3d(actor);
-			 super.setActor3d(actor);
-		 }
-		 public Array<Action3d> getActions () {
-			 return actions;
-		 }
-		 @Override
-		 public String toString () {
-			 StringBuilder buffer = new StringBuilder(64);
-			 buffer.append(super.toString());
-			 buffer.append('(');
-			 Array<Action3d> actions = this.actions;
-			 for (int i = 0, n = actions.size; i < n; i++) {
-				 if (i > 0) buffer.append(", ");
-				 buffer.append(actions.get(i));
-			 }
-			 buffer.append(')');
-			 return buffer.toString();
-		 }
-	  }
-	  /** Base class for actions that transition over time using the percent complete since the last frame.
-	   * @author Nathan Sweet */
-	  abstract public static class RelativeTemporalAction extends TemporalAction {
-		  private float lastPercent;
-		  @Override
-		  protected void begin () {
-			  lastPercent = 0;
-		  }
-		  @Override
-		  protected void update (float percent) {
-			  updateRelative(percent - lastPercent);
-			  lastPercent = percent;
-		  }
-		  abstract protected void updateRelative (float percentDelta);
-	  }
-	  /** Removes an action from an actor.
-	   * @author Nathan Sweet */
-	  public static class RemoveAction extends Action3d {
-		  private Actor3d targetActor;
-		  private Action3d action;
-		  @Override
-		  public boolean act (float delta) {
-			  (targetActor != null ? targetActor : actor3d).removeAction3d(action);
-			  return true;
-		  }
-		  public Actor3d getTargetActor () {
-			  return targetActor;
-		  }
-		  /** Sets the actor to remove an action from. If null (the default), the {@link #getActor() actor} will be used. */
-		  public void setTargetActor (Actor3d actor) {
-			  this.targetActor = actor;
-		  }
-		  public Action3d getAction () {
-			  return action;
-		  }
-		  public void setAction(Action3d action) {
-			  this.action = action;
-		  }
-		  @Override
-		  public void reset () {
-			  super.reset();
-			  targetActor = null;
-			  action = null;
-		  }
-	  }
-	  /** Removes an actor from the stage.
-	   * @author Nathan Sweet */
-	  public static class RemoveActorAction extends Action3d {
-		  private Actor3d removeActor;
-		  private boolean removed;
-		  @Override
-		  public boolean act (float delta) {
-			  if (!removed) {
-				  removed = true;
-				  (removeActor != null ? removeActor : actor3d).remove();
-			  }
-			  return true;
-		  }
-		  @Override
-		  public void restart () {
-			  removed = false;
-		  }
-		  @Override
-		  public void reset () {
-			  super.reset();
-			  removeActor = null;
-		  }
-		  public Actor3d getRemoveActor () {
-			  return removeActor;
-		  }
-		  /** Sets the actor to remove. If null (the default), the {@link #getActor() actor} will be used. */
-		  public void setRemoveActor (Actor3d removeActor) {
-			  this.removeActor = removeActor;
-		  }
-	  }
-	  /** Repeats an action a number of times or forever.
-	   * @author Nathan Sweet */
-	  public static class RepeatAction extends DelegateAction {
-		  static public final int FOREVER = -1;
-		  private int repeatCount, executedCount;
-		  private boolean finished;
-		  @Override
-		  protected boolean delegate (float delta) {
-			  if (executedCount == repeatCount) return true;
-			  if (action.act(delta)) {
-				  if (finished) return true;
-				  if (repeatCount > 0) executedCount++;
-				  if (executedCount == repeatCount) return true;
-				  if (action != null) action.restart();
-			  }
-			  return false;
-		  }
-		  /** Causes the action to not repeat again. */
-		  public void finish () {
-			  finished = true;
-		  }
-		  @Override
-		  public void restart () {
-			  super.restart();
-			  executedCount = 0;
-			  finished = false;
-		  }
-		  /** Sets the number of times to repeat. Can be set to {@link #FOREVER}. */
-		  public void setCount (int count) {
-			  this.repeatCount = count;
-		  }
-		  public int getCount () {
-			  return repeatCount;
-		  }
-	  }
-	  /** Sets the actor's rotation from its current value to a relative value.
-	   * @author Nathan Sweet */
-	  public static class RotateByAction extends RelativeTemporalAction {
-		  private float amount;
-		  @Override
-		  protected void updateRelative (float percentDelta) {
-			  actor3d.rotate(amount * percentDelta);
-		  }
-		  public float getAmount () {
-			  return amount;
-		  }
-		  public void setAmount (float rotationAmount) {
-			  amount = rotationAmount;
-		  }
-	  }
-	  /** Sets the actor's rotation from its current value to a specific value.
-	   * @author Nathan Sweet */
-	  public static class RotateToAction extends TemporalAction {
-		  private float start, end;
-		  @Override
-		  protected void begin () {
-			  start = actor3d.getRotation();
-		  }
-		  @Override
-		  protected void update (float percent) {
-			  actor3d.setRotation(start + (end - start) * percent);
-		  }
-		  public float getRotation () {
-			  return end;
-		  }
-		  public void setRotation (float rotation) {
-			  this.end = rotation;
-		  }
-	  }
-	  /** An action that runs a {@link Runnable}. Alternatively, the {@link #run()} method can be overridden instead of setting a
-	   * runnable.
-	   * @author Nathan Sweet */
-	  public static class RunnableAction extends Action3d {
-		  private Runnable runnable;
-		  private boolean ran;
-		  @Override
-		  public boolean act (float delta) {
-			  if (!ran) {
-				  ran = true;
-				  run();
-			  }
-			  return true;
-		  }
-		  /** Called to run the runnable. */
-		  public void run () {
-			  Pool pool = getPool();
-			  setPool(null); // Ensure this action can't be returned to the pool inside the runnable.
-			  try {
-				  runnable.run();
-			  } finally {
-				  setPool(pool);
-			  }
-		  }
-		  @Override
-		  public void restart () {
-			  ran = false;
-		  }
-		  @Override
-		  public void reset () {
-			  super.reset();
-			  runnable = null;
-		  }
-		  public Runnable getRunnable () {
-			  return runnable;
-		  }
-		  public void setRunnable (Runnable runnable) {
-			  this.runnable = runnable;
-		  }
-	  }
-	  /** Scales an actor's scale to a relative size.
-	   * @author Nathan Sweet */
-	  public static class ScaleByAction extends RelativeTemporalAction {
-		  private float amountX, amountY, amountZ;
-		  @Override
-		  protected void updateRelative (float percentDelta) {
-			  actor3d.scale(amountX * percentDelta, amountY * percentDelta, amountZ * percentDelta);
-		  }
-		  public void setAmount (float x, float y, float z) {
-			  amountX = x;
-			  amountY = y;
-			  amountZ = z;
-		  }
-		  public void setAmount (float scale) {
-			  amountX = scale;
-			  amountY = scale;
-			  amountZ = scale;
-		  }
-		  public float getAmountX () {
-			  return amountX;
-		  }
-		  public void setAmountX (float x) {
-			  this.amountX = x;
-		  }
-		  public float getAmountY () {
-			  return amountY;
-		  }
-		  public void setAmountY (float y) {
-			  this.amountY = y;
-		  }
-		  public float getAmountZ () {
-			  return amountZ;
-		  }
-		  public void setAmountZ (float z) {
-			  this.amountZ = z;
-		  }
-	  }
-	  /** Sets the actor's scale from its current value to a specific value.
-	   * @author Nathan Sweet */
-	  public static class ScaleToAction extends TemporalAction {
-		  private float startX, startY, startZ;
-		  private float endX, endY, endZ;
-		  @Override
-		  protected void begin () {
-			  startX = actor3d.getScaleX();
-			  startY = actor3d.getScaleY();
-			  startZ = actor3d.getScaleZ();
-		  }
-		  @Override
-		  protected void update (float percent) {
-			  actor3d.setScale(startX + (endX - startX) * percent, startY + (endY - startY) * percent,
-					  startZ + (endZ - startZ) * percent);
-		  }
-		  public void setScale (float x, float y, float z) {
-			  endX = x;
-			  endY = y;
-			  endZ = z;
-		  }
-		  public void setScale (float scale) {
-			  endX = scale;
-			  endY = scale;
-			  endZ = scale;
-		  }
-		  public float getX () {
-			  return endX;
-		  }
-		  public void setX (float x) {
-			  this.endX = x;
-		  }
-		  public float getY () {
-			  return endY;
-		  }
-		  public void setY (float y) {
-			  this.endY = y;
-		  }
-		  public float getZ () {
-			  return endZ;
-		  }
-		  public void setZ (float z) {
-			  this.endZ = z;
-		  }
-	  }
-	  /** Executes a number of actions one at a time.
-	   * @author Nathan Sweet */
-	  public static class SequenceAction extends ParallelAction {
-		  private int index;
-		  public SequenceAction () {
-		  }
-		  public SequenceAction (Action3d action1) {
-			  addAction(action1);
-		  }
-		  public SequenceAction (Action3d action1, Action3d action2) {
-			  addAction(action1);
-			  addAction(action2);
-		  }
-		  public SequenceAction (Action3d action1, Action3d action2, Action3d action3) {
-			  addAction(action1);
-			  addAction(action2);
-			  addAction(action3);
-		  }
-		  public SequenceAction (Action3d action1, Action3d action2, Action3d action3, Action3d action4) {
-			  addAction(action1);
-			  addAction(action2);
-			  addAction(action3);
-			  addAction(action4);
-		  }
-		  public SequenceAction (Action3d action1, Action3d action2, Action3d action3, Action3d action4, Action3d action5) {
-			  addAction(action1);
-			  addAction(action2);
-			  addAction(action3);
-			  addAction(action4);
-			  addAction(action5);
-		  }
-		  @Override
-		  public boolean act (float delta) {
-			  if (index >= actions.size) return true;
-			  Pool<Action3d> pool = getPool();
-			  setPool(null); // Ensure this action can't be returned to the pool while executings.
-			  try {
-				  if (actions.get(index).act(delta)) {
-					  if (actor3d == null) return true; // This action was removed.
-					  index++;
-					  if (index >= actions.size) return true;
-				  }
-				  return false;
-			  } finally {
-				  setPool(pool);
-			  }
-		  }
-		  @Override
-		  public void restart () {
-			  super.restart();
-			  index = 0;
-		  }
-	  }
-	  /** Base class for actions that transition over time using the percent complete.
-	   * @author Nathan Sweet */
-	  abstract public static class TemporalAction extends Action3d {
-		  private float duration, time;
-		  private Interpolation interpolation;
-		  private boolean reverse, began, complete;
-		  public TemporalAction () {
-		  }
-		  public TemporalAction (float duration) {
-			  this.duration = duration;
-		  }
-		  public TemporalAction (float duration, Interpolation interpolation) {
-			  this.duration = duration;
-			  this.interpolation = interpolation;
-		  }
-		  @Override
-		  public boolean act (float delta) {
-			  if (complete) return true;
-			  Pool pool = getPool();
-			  setPool(null); // Ensure this action can't be returned to the pool while executing.
-			  try {
-				  if (!began) {
-					  begin();
-					  began = true;
-				  }
-				  time += delta;
-				  complete = time >= duration;
-				  float percent;
-				  if (complete)
-					  percent = 1;
-				  else {
-					  percent = time / duration;
-					  if (interpolation != null) percent = interpolation.apply(percent);
-				  }
-				  update(reverse ? 1 - percent : percent);
-				  if (complete) end();
-				  return complete;
-			  } finally {
-				  setPool(pool);
-			  }
-		  }
-		  /** Called the first time {@link #act(float)} is called. This is a good place to query the {@link #actor actor's} starting
-		   * state. */
-		  protected void begin () {
-		  }
-		  /** Called the last time {@link #act(float)} is called. */
-		  protected void end () {
-		  }
-		  /** Called each frame.
-		   * @param percent The percentage of completion for this action, growing from 0 to 1 over the duration. If
-		   *           {@link #setReverse(boolean) reversed}, this will shrink from 1 to 0. */
-		  abstract protected void update (float percent);
-		  /** Skips to the end of the transition. */
-		  public void finish () {
-			  time = duration;
-		  }
-		  @Override
-		  public void restart () {
-			  time = 0;
-			  began = false;
-			  complete = false;
-		  }
-		  @Override
-		  public void reset () {
-			  super.reset();
-			  reverse = false;
-			  interpolation = null;
-		  }
-		  /** Gets the transition time so far. */
-		  public float getTime () {
-			  return time;
-		  }
-		  /** Sets the transition time so far. */
-		  public void setTime (float time) {
-			  this.time = time;
-		  }
-		  public float getDuration () {
-			  return duration;
-		  }
-		  /** Sets the length of the transition in seconds. */
-		  public void setDuration (float duration) {
-			  this.duration = duration;
-		  }
-		  public Interpolation getInterpolation () {
-			  return interpolation;
-		  }
-		  public void setInterpolation (Interpolation interpolation) {
-			  this.interpolation = interpolation;
-		  }
-		  public boolean isReverse () {
-			  return reverse;
-		  }
-		  /** When true, the action's progress will go from 100% to 0%. */
-		  public void setReverse (boolean reverse) {
-			  this.reverse = reverse;
-		  }
-	  }
-	  /** Multiplies the delta of an action.
-	   * @author Nathan Sweet */
-	  public static class TimeScaleAction extends DelegateAction {
-		  private float scale;
-		  @Override
-		  protected boolean delegate (float delta) {
-			  if (action == null) return true;
-			  return action.act(delta * scale);
-		  }
-		  public float getScale () {
-			  return scale;
-		  }
-		  public void setScale (float scale) {
-			  this.scale = scale;
-		  }
-	  }
-	  /** Sets the actor's {@link Actor#setVisible(boolean) visibility}.
-	   * @author Nathan Sweet */
-	  public static class VisibleAction extends Action3d {
-		  private boolean visible;
-		  @Override
-		  public boolean act (float delta) {
-			  actor3d.setVisible(visible);
-			  return true;
-		  }
-		  public boolean isVisible () {
-			  return visible;
-		  }
-		  public void setVisible (boolean visible) {
-			  this.visible = visible;
-		  }
-	  }
-}
-abstract class Action3d implements Poolable {
-    /** The actor this action is attached to, or null if it is not attached. */
-    protected Actor3d actor3d;
-    private Pool<Action3d> pool;
-    /** Updates the action based on time. Typically this is called each frame by {@link Actor#act(float)}.
-     * @param delta Time in seconds since the last frame.
-     * @return true if the action is done. This method may continue to be called after the action is done. */
-    abstract public boolean act (float delta);
-    /** Sets the state of the action so it can be run again. */
-    public void restart () {
-    }
-    /** @return null if the action is not attached to an actor. */
-    public Actor3d getActor3d() {
-            return actor3d;
-    }
-    /** Sets the actor this action will be used for. This is called automatically when an action is added to an actor. This is also
-     * called with null when an action is removed from an actor. When set to null, if the action has a {@link #setPool(Pool) pool}
-     * then the action is {@link Pool#free(Object) returned} to the pool (which calls {@link #reset()}) and the pool is set to null.
-     * If the action does not have a pool, {@link #reset()} is not called.
-     * <p>
-     * This method is not typically a good place for a subclass to query the actor's state because the action may not be executed
-     * for some time, eg it may be {@link DelayAction delayed}. The actor's state is best queried in the first call to
-     * {@link #act(float)}. For a {@link TemporalAction}, use TemporalAction#begin(). */
-    public void setActor3d(Actor3d actor) {
-            this.actor3d = actor;
-            if (actor == null) {
-                    if (pool != null) {
-                            pool.free(this);
-                            pool = null;
-                    }
-            }
-    }
-    /** Resets the optional state of this action to as if it were newly created, allowing the action to be pooled and reused. State
-     * required to be set for every usage of this action or computed during the action does not need to be reset.
-     * <p>
-     * The default implementation calls {@link #restart()}.
-     * <p>
-     * If a subclass has optional state, it must override this method, call super, and reset the optional state. */
-    public void reset () {
-            restart();
-    }
-    public Pool getPool () {
-            return pool;
-    }
-    /** Sets the pool that the action will be returned to when removed from the actor.
-     * @param pool May be null.
-     * @see #setActor(Actor) */
-    public void setPool (Pool pool) {
-            this.pool = pool;
-    }
-    public String toString () {
-            String name = getClass().getName();
-            int dotIndex = name.lastIndexOf('.');
-            if (dotIndex != -1) name = name.substring(dotIndex + 1);
-            if (name.endsWith("Action")) name = name.substring(0, name.length() - 6);
-            return name;
-    }
-}

Stage/Actor3d.java DELETED Viewed

@@ -1,361 +0,0 @@
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g3d.Material;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute;
-import com.badlogic.gdx.math.collision.BoundingBox;
-import com.badlogic.gdx.scenes.scene2d.Group;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.DelayedRemovalArray;
-public class Actor3d extends ModelInstance {
-	private Stage3d stage3d;
-	private Group3d parent;
-	private final DelayedRemovalArray<Event3dListener> listeners = new DelayedRemovalArray<Event3dListener>(0);
-	private final Array<Action3d> actions3d = new Array<Action3d>(0);
-	private String name;
-	private boolean visible = true;
-	private float x, y, z;
-	private float originX, originY, originZ;
-	private float scaleX = 1, scaleY = 1, scaleZ = 1;
-	private float rotation = 0;
-	private BoundingBox boundBox;
-	public Actor3d(){
-		super(new Model());
-		setPosition(0,0,0);
-		setOrigin(0,0,0);
-	}
-	public Actor3d(Model model){
-		super(model);
-		setPosition(0,0,0);
-		boundBox = model.meshes.get(0).calculateBoundingBox();
-		setOrigin(boundBox.max.x, boundBox.max.y, boundBox.max.z);
-	}
-	public Actor3d(Model model, float x, float y, float z){
-		super(model);
-		setPosition(x,y,z);
-		boundBox = model.meshes.get(0).calculateBoundingBox();
-		setOrigin(boundBox.max.x, boundBox.max.y, boundBox.max.z);
-	}
-	/** Updates the actor3d based on time. Typically this is called each frame by {@link Stage3d#act(float)}.
-	 * <p>
-	 * The default implementation calls {@link Action3d#act(float)} on each action and removes actions that are complete.
-	 * @param delta Time in seconds since the last frame. */
-	public void act (float delta) {
-		for (int i = 0; i < actions3d.size; i++) {
-			Action3d action3d = actions3d.get(i);
-			if (action3d.act(delta) && i < actions3d.size) {
-				actions3d.removeIndex(i);
-				action3d.setActor3d(null);
-				i--;
-			}
-		}
-	}
-	public Actor3d hit (float x, float y) {
-		return null;
-	}
-	/** Removes this actor3d from its parent, if it has a parent.
-	 * @see Group#removeActor3d(Actor3d) */
-	public boolean remove () {
-		if (parent != null) return parent.removeActor3d(this);
-		return false;
-	}
-	/** Add a listener to receive events that {@link #hit(float, float, boolean) hit} this actor3d. See {@link #fire(Event)}.
-	 *
-	 * @see InputListener
-	 * @see ClickListener */
-	public boolean addListener(Event3dListener listener) {
-		if (!listeners.contains(listener, true)) {
-			listeners.add(listener);
-			return true;
-		}
-		return false;
-	}
-	public boolean removeListener (Event3dListener listener) {
-		return listeners.removeValue(listener, true);
-	}
-	public Array<Event3dListener> getListeners () {
-		return listeners;
-	}
-	public void addAction3d (Action3d action) {
-		action.setActor3d(this);
-		actions3d.add(action);
-	}
-	public void removeAction3d (Action3d action) {
-		if (actions3d.removeValue(action, true)) action.setActor3d(null);
-	}
-	public Array<Action3d> getActions3d () {
-		return actions3d;
-	}
-	/** Removes all actions on this actor3d. */
-	public void clearActions3d () {
-		for (int i = actions3d.size - 1; i >= 0; i--)
-			actions3d.get(i).setActor3d(null);
-		actions3d.clear();
-	}
-	/** Removes all listeners on this actor3d. */
-	public void clearListeners () {
-		listeners.clear();
-	}
-	/** Removes all actions and listeners on this actor3d. */
-	public void clear () {
-		clearActions3d();
-		clearListeners();
-	}
-	/** Called by the framework when this actor3d or any parent is added to a group that is in the stage3d.
-	 * @param stage3d May be null if the actor3d or any parent is no longer in a stage. */
-	protected void setStage3d(Stage3d stage3d) {
-		this.stage3d = stage3d;
-	}
-	/** Returns the stage3d that this actor3d is currently in, or null if not in a stage. */
-	public Stage3d getStage3d() {
-		return stage3d;
-	}
-	/** Returns true if this actor3d is the same as or is the descendant of the specified actor3d. */
-	public boolean isDescendantOf (Actor3d actor3d) {
-		if (actor3d == null) throw new IllegalArgumentException("actor3d cannot be null.");
-		Actor3d parent = this;
-		while (true) {
-			if (parent == null) return false;
-			if (parent == actor3d) return true;
-			parent = parent.parent;
-		}
-	}
-	/** Returns true if this actor3d is the same as or is the ascendant of the specified actor3d. */
-	public boolean isAscendantOf (Actor3d actor3d) {
-		if (actor3d == null) throw new IllegalArgumentException("actor3d cannot be null.");
-		while (true) {
-			if (actor3d == null) return false;
-			if (actor3d == this) return true;
-			actor3d = actor3d.parent;
-		}
-	}
-	/** Returns true if the actor3d's parent is not null. */
-	public boolean hasParent () {
-		return parent != null;
-	}
-	/** Returns the parent actor3d, or null if not in a stage. */
-	public Group3d getParent () {
-		return parent;
-	}
-	/** Called by the framework when an actor3d is added to or removed from a group.
-	 * @param parent May be null if the actor3d has been removed from the parent. */
-	protected void setParent (Group3d parent) {
-		this.parent = parent;
-	}
-	public boolean isVisible () {
-		return visible;
-	}
-	/** If false, the actor3d will not be drawn and will not receive touch events. Default is true. */
-	public void setVisible (boolean visible) {
-		this.visible = visible;
-	}
-	/* Sets the originx , originy and originz used for rotation */
-	public void setOrigin (float originX, float originY, float originZ) {
-		this.originX = originX;
-		this.originY = originY;
-		this.originZ = originZ;
-	}
-	public void setPosition(float x, float y, float z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		transform.setToTranslationAndScaling(this.x, this.y, this.z, scaleX, scaleY, scaleZ);
-	}
-	public void translate(float x, float y, float z) {
-		this.x += x;
-		this.y += y;
-		this.z += z;
-		transform.setToTranslationAndScaling(this.x, this.y, this.z, scaleX, scaleY, scaleZ);
-	}
-	public void setRotation(float degrees) {
-		this.rotation = degrees;
-		this.rotate(degrees);
-		transform.setToRotation(originX, originY, originZ, rotation);
-	}
-	public void rotate (float degrees) {
-		rotation += degrees;
-		setPosition(x, y, z);
-		transform.setToRotation(originX, originY, originZ, rotation);
-	}
-	public void setScale(float scaleX, float scaleY, float scaleZ) {
-		this.scaleX = scaleX;
-		this.scaleY = scaleY;
-		this.scaleZ = scaleZ;
-		transform.setToScaling(scaleX, scaleY, scaleZ);
-	}
-	public void setScale(float scale) {
-		this.scaleX = scale;
-		this.scaleY = scale;
-		this.scaleZ = scale;
-		transform.setToScaling(scaleX, scaleY, scaleZ);
-	}
-	/** Adds the specified scale to the current scale. */
-	public void scale(float scale) {
-		scaleX += scale;
-		scaleY += scale;
-		scaleZ += scale;
-		transform.scl(scale); // re-implement this
-	}
-	public void scale(float scaleX, float scaleY, float scaleZ) {
-		this.scaleX += scaleX;
-		this.scaleY += scaleY;
-		this.scaleZ += scaleZ;
-		transform.scl(scaleX, scaleY, scaleZ); // re-implement this
-	}
-	public void setX (float x) {
-		this.x = x;
-		transform.setToTranslation(x, y, z);
-	}
-	public float getX () {
-		return x;
-	}
-	public void setY (float y) {
-		this.y = y;
-		transform.setToTranslation(x, y, z);
-	}
-	public float getY () {
-		return y;
-	}
-	public void setZ (float z) {
-		this.z = z;
-		transform.setToTranslation(x, y, z);
-	}
-	public float getZ (){
-		return z;
-	}
-	public void setOriginX (float originX) {
-		this.originX = originX;
-	}
-	public float getOriginX () {
-		return originX;
-	}
-	public void setOriginY (float originY) {
-		this.originY = originY;
-	}
-	public float getOriginY () {
-		return originY;
-	}
-	public void setOriginZ (float originZ) {
-		this.originZ = originZ;
-	}
-	public float getOriginZ () {
-		return originZ;
-	}
-	public void setScaleX (float scaleX) {
-		this.scaleX = scaleX;
-		transform.scale(scaleX, scaleY, scaleZ);
-	}
-	public float getScaleX () {
-		return scaleX;
-	}
-	public float getRotation () {
-		return rotation;
-	}
-	public void setScaleY (float scaleY) {
-		this.scaleY = scaleY;
-		transform.scale(scaleX, scaleY, scaleZ);
-	}
-	public float getScaleY () {
-		return scaleY;
-	}
-	public void setScaleZ (float scaleZ) {
-		this.scaleY = scaleZ;
-		transform.scale(scaleX, scaleY, scaleZ);
-	}
-	public float getScaleZ () {
-		return scaleZ;
-	}
-	/** Sets a name for easier identification of the actor3d in application code.
-	 * @see Group#findActor(String) */
-	public void setName (String name) {
-		this.name = name;
-	}
-	public String getName () {
-		return name;
-	}
-	public String toString () {
-		String name = this.name;
-		if (name == null) {
-			name = getClass().getName();
-			int dotIndex = name.lastIndexOf('.');
-			if (dotIndex != -1) name = name.substring(dotIndex + 1);
-		}
-		return name;
-	}
-	public Color getColor(){
-		return ((ColorAttribute)getMaterial("Color").get(ColorAttribute.Diffuse)).color;
-	}
-	public void setColor(Color color){
-		ColorAttribute ca = new ColorAttribute(ColorAttribute.Diffuse, color);
-		if(getMaterial("Color") != null)
-			getMaterial("Color").set(ca);
-		else
-			materials.add(new Material("Color", ca));
-			model.materials.add(new Material("Color", ca));
-	}
-}

Stage/Group3d.java DELETED Viewed

@@ -1,146 +0,0 @@
-import com.badlogic.gdx.graphics.g3d.Environment;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.SnapshotArray;
-public class Group3d extends Actor3d{
-	private final SnapshotArray<Actor3d> children = new SnapshotArray<Actor3d>(true, 4, Actor3d.class);
-	public Group3d(){
-		super();
-	}
-	public Group3d(Model model){
-		super(model);
-	}
-	public void act (float delta) {
-		super.act(delta);
-		Actor3d[] actors = children.begin();
-		for (int i = 0, n = children.size; i < n; i++)
-			actors[i].act(delta);
-		children.end();
-	}
-	public void drawChildren(ModelBatch modelBatch, Environment environment){
-		modelBatch.render(this, environment);
-		modelBatch.render(children, environment);
-		for(Actor3d a: children){
-			if(a instanceof Group3d){
-				((Group3d) a).drawChildren(modelBatch, environment);
-			}
-		}
-	}
-	/** Adds an actor as a child of this group. The actor is first removed from its parent group, if any.
-	 * @see #remove() */
-	public void addActor3d(Actor3d actor3d) {
-		actor3d.remove();
-		children.add(actor3d);
-		actor3d.setParent(this);
-		actor3d.setStage3d(getStage3d());
-		childrenChanged();
-	}
-	/** Removes an actor from this group. If the actor will not be used again and has actions, they should be
-	 * {@link Actor#clearActions3d() cleared} so the actions will be returned to their
-	 * {@link Action#setPool(com.badlogic.gdx.utils.Pool) pool}, if any. This is not done automatically. */
-	public boolean removeActor3d(Actor3d actor3d) {
-		if (!children.removeValue(actor3d, true)) return false;
-		Stage3d stage = getStage3d();
-		if (stage != null) stage.unfocus(actor3d);
-		actor3d.setParent(null);
-		actor3d.setStage3d(null);
-		childrenChanged();
-		return true;
-	}
-	@Override
-	public void addAction3d(Action3d action3d){
-		super.addAction3d(action3d);
-		Actor3d[] actors = children.begin();
-		for (int i = 0, n = children.size; i < n; i++)
-			actors[i].addAction3d(action3d);
-		children.end();
-	}
-	@Override
-	public void removeAction3d(Action3d action3d) {
-		super.removeAction3d(action3d);
-		Actor3d[] actors = children.begin();
-		for (int i = 0, n = children.size; i < n; i++)
-			actors[i].removeAction3d(action3d);
-		children.end();
-	}
-	/** Called when actors are added to or removed from the group. */
-	protected void childrenChanged () {
-	}
-	/** Removes all actors from this group. */
-	public void clearChildren () {
-		Actor3d[] actors = children.begin();
-		for (int i = 0, n = children.size; i < n; i++) {
-			Actor3d child = actors[i];
-			child.setStage3d(null);
-			child.setParent(null);
-		}
-		children.end();
-		children.clear();
-		childrenChanged();
-	}
-	/** Removes all children, actions, and listeners from this group. */
-	public void clear () {
-		super.clear();
-		clearChildren();
-	}
-	/** Returns the first actor found with the specified name. Note this recursively compares the name of every actor in the group. */
-	public Actor3d findActor3d(String name) {
-		Array<Actor3d> children = this.children;
-		for (int i = 0, n = children.size; i < n; i++)
-			if (name.equals(children.get(i).getName())) return children.get(i);
-		for (int i = 0, n = children.size; i < n; i++) {
-			Actor3d child = children.get(i);
-			if (child instanceof Group3d) {
-				Actor3d actor = ((Group3d)child).findActor3d(name);
-				if (actor != null) return actor;
-			}
-		}
-		return null;
-	}
-	@Override
-	protected void setStage3d(Stage3d stage3d) {
-		super.setStage3d(stage3d);
-		Array<Actor3d> children = this.children;
-		for (int i = 0, n = children.size; i < n; i++)
-			children.get(i).setStage3d(stage3d);
-	}
-	/** Returns an ordered list of child actors in this group. */
-	public SnapshotArray<Actor3d> getChildren () {
-		return children;
-	}
-	public boolean hasChildren () {
-		return children.size > 0;
-	}
-	/** Prints the actor hierarchy recursively for debugging purposes. */
-	public void print () {
-		print("");
-	}
-	private void print (String indent) {
-		Actor3d[] actors = children.begin();
-		for (int i = 0, n = children.size; i < n; i++) {
-			System.out.println(indent + actors[i]);
-			if (actors[i] instanceof Group3d) ((Group3d)actors[i]).print(indent + "|  ");
-		}
-		children.end();
-	}
-}

Stage/Scene.java DELETED Viewed

@@ -1,80 +0,0 @@
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.utils.ArrayMap;
-import com.badlogic.gdx.utils.StringBuilder;
-abstract public class Scene extends Actor {
-	/* The array map containing all the scenes data of the game*/
-	public static final ArrayMap<String, String> scenesMap = new ArrayMap<String, String>();
-	private String sceneName = "";
-	public String sceneBackground = "None";
-	public String sceneMusic = "None";
-	public String sceneTransition = "None";
-	public float sceneDuration = 0;
-	public InterpolationType sceneInterpolationType = InterpolationType.Linear;
-	public Scene(){
-		setPosition(0, 0);
-		setSize(0, 0);
-		setBounds(0,0, 0, 0);
-		sceneName = this.getClass().getName();
-		setName(sceneName);
-		Stage.log("Current Scene: "+sceneName);
-		load(sceneName);
-	}
-	public abstract void onClick(Actor actor);
-	public abstract void onTouchDown(Actor actor);
-	public abstract void onTouchUp();
-	public abstract void onDragged();
-	public abstract void onGesture(GestureType gestureType);
-	public abstract void onKeyTyped(char key);
-	public abstract void onKeyUp(int keycode);
-	public abstract void onKeyDown(int keycode);
-	public abstract void onPause();
-	public abstract void onResume();
-	public abstract void onDispose();
-	public void load(String sceneName){
-		Stage.log("Load");
-		String[] lines = Scene.scenesMap.get(sceneName).split("\n");
-		for(String line: lines){
-			if(line.trim().isEmpty())
-				continue;
-			Stage.addActor(Stage.json.fromJson(Actor.class, line));
-		}
-		if(!sceneBackground.equals("None"))
-			Stage.setBackground(sceneBackground);
-		if(!sceneMusic.equals("None"))
-			Asset.musicPlay(sceneMusic);
-		if(!sceneTransition.equals("None"))
-			Effect.transition(TransitionType.valueOf(sceneTransition),
-					Stage.getRoot(), sceneDuration, sceneInterpolationType);
-	}
-	protected void save(){
-		save(sceneName);
-	}
-	public void save(String sceneName){
-		Stage.log("Save");
-		StringBuilder sb = new StringBuilder();
-		Stage.removeActor("Shape");
-		for(Actor actor: Stage.getChildren()){
-			if(Stage.isValidActor(actor)){
-				//Stage.log(actor.getName());
-				sb.append(Stage.json.toJson(actor));
-				sb.append("\n");
-			}
-		}
-		scenesMap.put(sceneName, sb.toString());
-		Gdx.files.local(Asset.basePath+"scene").writeString(Stage.json.toJson(scenesMap, ArrayMap.class,
-				String.class), false);
-		sb = null;
-	}
-	public String getSceneName(){
-		return sceneName;
-	}
-}

Stage/Scene3d.java DELETED Viewed

@@ -1,5 +0,0 @@
-public class Scene3d {
-}

Stage/SpriteChar.java DELETED Viewed

@@ -1,11 +0,0 @@
-import com.badlogic.gdx.graphics.g2d.Animation;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-public class SpriteChar extends Actor {
-	public SpriteChar(){
-	}
-}

Stage/Stage.java DELETED Viewed

@@ -1,1272 +0,0 @@
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Files.FileType;
-import com.badlogic.gdx.InputMultiplexer;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.OrthographicCamera;
-import com.badlogic.gdx.graphics.PerspectiveCamera;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g3d.utils.CameraInputController;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
-import com.badlogic.gdx.math.Interpolation;
-import com.badlogic.gdx.math.Intersector;
-import com.badlogic.gdx.math.MathUtils;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.scenes.scene2d.Action;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.Group;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
-import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonReader;
-import com.badlogic.gdx.utils.JsonValue;
-import com.badlogic.gdx.utils.Scaling;
-import com.badlogic.gdx.utils.SnapshotArray;
-import com.badlogic.gdx.utils.Timer;
-import com.badlogic.gdx.utils.Timer.Task;
-/** The Main Entry Point for the Game is the Stage class
- * <p>
- * It consists of a single Stage2d, Stage3d, Camera2d, and Camera3d which are all initialized based on the config file.
- * The root of the stage can be accessed in a statically {@link #getRoot()} and methods related to camera like moveTo, moveBy,
- * are also accessed the same way.<br>
- * It has extra things like stateTime, gameUptime, pauseState, PauseListeners, ResumeListeners, DisposeListeners.<br>
- *
- * It has automatic asset unloading and disposing and you can use {@link #exit()} to quit your game safely
- *
- * Note: Your TMX maps have to be unloaded manually as they can be huge resources needing to be freed early.
- *
- * It has static methods which can be used for panning the camera using mouse, keyboard, drag.. etc.
- * It can also automatically follow a actor by using followActor(Actor actor)<br>
- *
- * This class will register all your scenes based on your scene.json file and then you can switch you scenes by using {@link #setScene}
- * method with the sceneClassName.<br>
- *
- * Run the Desktop Game by using Stage class as it contains the static main declaration.<br>
- * Your first sceneName in the config.json file gets shown first automatically and once and all your assets <br>
- * are loaded in the background(asynchronously) in the first scene and then automatically the next scene in the list is set.
- * You can stop the stage from switching to the next scene by setting Asset.loadAsynchronous = false in your first scene but then
- * you have to load all the assets by using the blocking call Asset.loadBlocking()
- *
- * If you want to display your splash screen for more time after the assets have loaded then you can change
- * Stage.splashDuration to the amount of time you want you splash screen to show. By default the splash screen's
- * lifetime is finished once the assets are loaded and then the next scene is set.
- *
- * <p>
- * @ex
- * <pre>
- * <code>
-    //This is our first Scene and it shows the libgdx logo until all the assets are loaded
-    //then it automatically switches to the Menu scene
-    public class  Splash extends Scene {
-		public Splash() {
-			Stage.splashDuration = 5f; // This will make my splash scene to wait 5 seconds after assets are all loaded
-			final Texture bg1 = new Texture("splash/libgdx.png");
-			final Image imgbg1 = new Image(bg1);
-			imgbg1.setFillParent(true);
-			Stage.addActor(imgbg1);
-	    }
-   }
-    //This is Scene gets called once the assets are loaded
-    public class  Menu extends Scene {
-		public Menu() {
-			//create some actors
-			// if you used sink studio and create a scene like Menu.json then
-			// it will automatically call load("Menu") it will populate your scene after parsing the json file
-			//you can access these objects like this
-			TextButton btn = (TextButton) Stage.findActor("TextButton1");
-			Image img = (Image) Stage.findActor("Image5");
-			// these actors are loaded from the json file and are give names which allows
-			// easy access to them
-		}
-	}
- </code>
- </pre>
- * @author pyros2097 */
-public final class Stage implements ApplicationListener {
-	private static Stage instance;
-	public static float stateTime = 0;
-	public static float gameUptime = 0;
-	private float startTime = System.nanoTime();
-	public static final Json json = new Json();
-	public static final JsonReader jsonReader = new JsonReader();
-	public static JsonValue configJson = null;
-	private static com.badlogic.gdx.scenes.scene2d.Stage stage2d;
-	private static OrthographicCamera camera;
-	private static Label fpsLabel;
-	private static Stage3d stage3d;
-	public static InputMultiplexer inputMux = new InputMultiplexer();
-	private static CameraInputController camController;
-	public static boolean use3d = true;
-	private static Scene currentScene = null;
-	private static int sceneIndex = 0;
-	private static final Array<Actor> hudActors = new Array<Actor>();
-	/*Important:
-	 *  The Target Width  and Target Height refer to the nominal width and height of the game for the
-	 *  graphics which are created  for this width and height, this allows for the Stage to scale this
-	 *  graphics for all screen width and height. Therefore your game will work on all screen sizes
-	 *  but maybe blurred or look awkward on some devices.
-	 *  ex:
-	 *  My Game targetWidth = 800 targetHeight = 480
-	 *  Then my game works perfectly for SCREEN_WIDTH = 800 SCREEN_HEIGHT = 480
-	 *  and on others screen sizes it is just zoomed/scaled but works fine thats all
-	 */
-	public static float targetWidth = 800;
-	public static float targetHeight  = 480;
-	public static boolean pauseState = false;
-	public static float splashDuration = 0f;
-	public static Color bgColor = new Color(1f,1f,1f,1f);
-	//Studio Related Stuff
-	/* Selected Actor can never be null as when the stage is clicked it may return an actor or the root actor */
-	private static ShapeRenderer shapeRenderer;
-	public static boolean debug = false;
-	public static ClassLoader cl = null;
-	public static int dots = 40;
-	public static int xlines;
-	public static int ylines;
-	public final static Vector2 mouse = new Vector2();
-	public static int pointer = 0;
-	public static int button = 0;
-	private final static Actor selectionBox = new Actor(){
-		@Override
-		public void draw(Batch batch, float alpha){
-			batch.end();
-			shapeRenderer.begin(ShapeType.Line);
-			shapeRenderer.setColor(Color.GREEN);
-			shapeRenderer.rect(getX(), getY(),
-						getWidth(),getHeight());
-			shapeRenderer.end();
-			batch.begin();
-		}
-	};
-	static {
-		selectionBox.setTouchable(Touchable.disabled);
-		selectionBox.setName("Shape");
-	};
-	/** The Main Launcher for Stage Game
-	 * <p>
-	 * Just specify the Stage class as the Main file and when you export your game to jar add
-	 * the manifest entry Main-Class: Stage for it to work.
-	 */
-	public static void main(String[] argc) {
-		final LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
-		configJson = jsonReader.parse(Stage.class.getClassLoader().getResourceAsStream("config"));
-		if(configJson.getBoolean("hasIcon"))
-			cfg.addIcon("icon.png", FileType.Internal);
-		String[] screen = configJson.getString("screenSize").split("x");
-		String[] target = configJson.getString("targetSize").split("x");
-		cfg.width = Integer.parseInt(screen[0]);
-		cfg.height = Integer.parseInt(screen[1]);
-		Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize();
-		cfg.x = (int) ((dimension.getWidth() - cfg.width) / 2);
-		cfg.y = (int) ((dimension.getHeight() - cfg.height) / 2);
-		cfg.resizable = configJson.getBoolean("resize");
-		cfg.forceExit =  configJson.getBoolean("forceExit");
-		cfg.fullscreen =  configJson.getBoolean("fullScreen");
-		cfg.useGL20 = configJson.getBoolean("useGL20");
-		cfg.vSyncEnabled = configJson.getBoolean("vSync");
-		cfg.audioDeviceBufferCount = configJson.getInt("audioBufferCount");
-		LwjglApplicationConfiguration.disableAudio = configJson.getBoolean("disableAudio");
-		targetWidth = Integer.parseInt(target[0]);
-		targetHeight = Integer.parseInt(target[1]);
-		new LwjglApplication(Stage.getInstance(), cfg);
-	}
-	/*
-	 * Singleton Pattern
-	 */
-	private Stage(){}
-	public static Stage getInstance(){
-		if(instance == null)
-			instance = new Stage();
-		return instance;
-	}
-	/*
-	 * This is where the stage and camera are created and the scenes are created
-	 * dynamically
-	*/
-	@Override
-	public final void create() {
-		log("Created");
-		Config.setup();
-		stage2d = new com.badlogic.gdx.scenes.scene2d.Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(),
-				configJson.getBoolean("keepAspectRatio"));
-		stage2d.getRoot().setName("Root");
-		stage2d.getRoot().setTouchable(Touchable.childrenOnly);
-		camera = new OrthographicCamera();
-		camera.setToOrtho(false, targetWidth, targetHeight);
-		camera.position.set(targetWidth/2, targetHeight/2, 0);
-		stage2d.setCamera(camera);
-		inputMux.addProcessor(stage2d);
- 		stage2d.addListener(touchInput);
- 		if(use3d){
- 			stage3d = new Stage3d();
-	 		camController = new CameraInputController(stage3d.getCamera());
-	 		inputMux.addProcessor(stage3d);
-	 		inputMux.addProcessor(camController);
- 		}
- 		shapeRenderer = new ShapeRenderer();
- 		Serializer.initialize();
- 		JsonValue sv = jsonReader.parse(Gdx.files.internal(Asset.basePath+"scene"));
- 		for(JsonValue jv: sv.iterator())
- 			Scene.scenesMap.put(jv.name, jv.asString());
- 		setScene(Scene.scenesMap.firstKey());
- 		xlines = (int)Gdx.graphics.getWidth()/dots;
- 		ylines = (int)Gdx.graphics.getHeight()/dots;
- 		Gdx.input.setCatchBackKey(true);
- 		Gdx.input.setCatchMenuKey(true);
- 		Gdx.input.setInputProcessor(inputMux);
-	}
-	/*
-	 * This is the main rendering call that updates the time, updates the stage,
-	 * loads assets asynchronously, updates the camera and FPS text.
-	 */
-	@Override
-	public final void render(){
-		if (System.nanoTime() - startTime >= 1000000000) {
-			gameUptime +=1 ;
-			startTime = System.nanoTime();
-		}
-		stateTime += Gdx.graphics.getDeltaTime();
-		Gdx.gl.glClearColor(bgColor.r, bgColor.g, bgColor.b, bgColor.a);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT |GL20.GL_DEPTH_BUFFER_BIT);
-		Asset.load();
-		if(use3d){
-			stage3d.act();
-	    	stage3d.draw();
-	    	camController.update();
-		}
-		stage2d.act();//Gdx.graphics.getDeltaTime();
-		stage2d.draw();
-		updateController();
-		if(debug){
-			shapeRenderer.begin(ShapeType.Point);
-			shapeRenderer.setColor(Color.BLACK);
-			for(int i = 0; i<=xlines; i++)
-				for(int j = 0; j<=ylines; j++)
-					shapeRenderer.point(2+i*dots, j*dots, 0);
-			shapeRenderer.end();
-		}
-		if (fpsLabel != null && configJson.getBoolean("showFps"))
-			fpsLabel.setText("Fps: " + Gdx.graphics.getFramesPerSecond());
- 	}
-	public static void outline(Actor actor){
-		selectionBox.setPosition(actor.getX(), actor.getY());
-		selectionBox.setSize(actor.getWidth(), actor.getHeight());
-		Stage.addActor(selectionBox);
-	}
-	/*
-	 * This will resize the stage accordingly to fit to your target width and height
-	 */
-	@Override
-	public final void resize(int width, int height) {
-		log("Resize");
-		stage2d.setViewport(targetWidth, targetHeight, configJson.getBoolean("keepAspectRatio"));
-		if(use3d)
-			stage3d.setViewport(targetWidth, targetHeight, configJson.getBoolean("keepAspectRatio"));
-	}
-	/*
-	 * This will pause any music and stop any sound being played
-	 * and will fire the Pause event
-	 */
-	@Override
-	public final void pause() {
-		log("Pause");
-		Asset.musicPause();
-		Asset.soundStop();
-		pauseState = true;
-		currentScene.onPause();
-	}
-	/*
-	 * This will resume any music currently being played
-	 * and will fire the Resume event
-	 */
-	@Override
-	public final void resume() {
-		log("Resume");
-		Asset.musicResume();
-		pauseState = false;
-		currentScene.onResume();
-	}
-	/*
-	 * When disposed is called
-	 * It will automatically unload all your assets and dispose the stage
-	 */
-	@Override
-	public final void dispose() {
-		log("Disposing");
-		currentScene.onDispose();
-		stage2d.dispose();
-		Asset.unloadAll();
-		Config.writeTotalTime(gameUptime);
-		Gdx.app.exit();
-	}
-	/*
-	 * Use this to exit your game safely
-	 * It will automatically unload all your assets and dispose the stage
-	*/
-	public static final void exit(){
-		log("Disposing and Exiting");
-		currentScene.onDispose();
-		stage2d.dispose();
-		Asset.unloadAll();
-		Config.writeTotalTime(gameUptime);
-		Gdx.app.exit();
-	}
-	public static void log(String log) {
-		if(configJson.getBoolean("loggingEnabled"))
-			Gdx.app.log("Stage ", log);
-	}
-	public static Group getRoot(){
-		return stage2d.getRoot();
-	}
-	/**
-	 * Get screen time from start in format of HH:MM:SS. It is calculated from
-	 * "secondsTime" parameter.
-	 * */
-	public static String toScreenTime(float secondstime) {
-		int seconds = (int)(secondstime % 60);
-		int minutes = (int)((secondstime / 60) % 60);
-		int hours =  (int)((secondstime / 3600) % 24);
-		return new String(addZero(hours) + ":" + addZero(minutes) + ":" + addZero(seconds));
-	}
-	private static String addZero(int value){
-		String str = "";
-		if(value < 10)
-			 str = "0" + value;
-		else
-			str = "" + value;
-		return str;
-	}
-/***********************************************************************************************************
-* 					Scene Related Functions											   		   	           *
-************************************************************************************************************/
-	/**
-	 * Set the current scene to be displayed
-	 * @param className The scene's Class Name
-	 **/
-	public static void setScene(String className){
-		if(!Scene.scenesMap.containsKey(className)){
-			log(className+": Scene Does not Exist");
-			return;
-		}
-		/*
-		 *  Every time the scene Changes disable panning/following/listening as it can cause the
-		 *  camera to move around aimlessly, thus abrupting the scene and clear
-		 *  all the listeners/huds that were registered in the previous scene
-		 */
-		sceneIndex = Scene.scenesMap.keys().toArray().indexOf(className, false);
-		if(currentScene != null)
-			currentScene.onDispose();
-		clear();
-		clear3d();
-		stage2d.addListener(touchInput);
-		stage2d.getRoot().setPosition(0, 0);
-		stage2d.getRoot().setSize(targetWidth, targetHeight);
-		stage2d.getRoot().setBounds(0,0,targetWidth,targetHeight);
-		stage2d.getRoot().setCullingArea(getBounds(stage2d.getRoot()));
-		stage2d.getRoot().setColor(1f, 1f, 1f, 1f);
-		stage2d.getRoot().setVisible(true);
-		stage3d.getRoot().setPosition(0, 0, 0);
-		stage3d.getRoot().setVisible(true);
-		try {
-			if(cl != null)
-				currentScene = (Scene) cl.loadClass(className).newInstance();
-			else
-				currentScene = (Scene) Class.forName(className).newInstance();
-			//addActor(currentScene);
-		} catch (InstantiationException e) {
-			log("Scene cannot be created , Check if scene class constructor is empty");
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			log("Scene cannot be created , Check if scene class can be found");
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			log("Scene cannot be created , Check if scene class can be found");
-			e.printStackTrace();
-		}
-		if (fpsLabel != null && configJson.getBoolean("showFPS")){
-			fpsLabel.setPosition(targetWidth - 80, targetHeight - 20);
-			addHud(fpsLabel);
-		}
-	}
-	/**
-	 * Set the current scene to be displayed with an amount of delay
-	 * @param className The registered scene's name
-	 **/
-	public static void setSceneWithDelay(final String className, float delay){
-		Timer.schedule(new Task(){
-			@Override
-			public void run() {
-				setScene(className);
-			}
-		}, delay);
-	}
-	/**
-	 * Returns the current scene being Displayed on stage
-	 **/
-	public static Scene getScene(){
-		return currentScene;
-	}
-	/**
-	 * Changes to the next scene in the scnesList
-	 **/
-	public static void nextScene(){
-		if(sceneIndex <= Scene.scenesMap.size)
-			sceneIndex++;
-		setScene(Scene.scenesMap.getKeyAt(sceneIndex));
-	}
-	/**
-	 * Changes to the previous scene in the scnesList
-	 **/
-	public static void prevScene(){
-		if(sceneIndex >= 0)
-			sceneIndex--;
-		setScene(Scene.scenesMap.getKeyAt(sceneIndex));
-	}
-	/**
-	 * Changes to the next scene in the scnesList
-	 **/
-	public static void nextSceneWithDelay(float delay){
-		if(sceneIndex <= Scene.scenesMap.size)
-			sceneIndex++;
-		setSceneWithDelay(Scene.scenesMap.getKeyAt(sceneIndex), delay);
-	}
-	/**
-	 * Changes to the previous scene in the scnesList
-	 **/
-	public static void prevSceneWithDelay(float delay){
-		if(sceneIndex >= 0)
-			sceneIndex--;
-		setSceneWithDelay(Scene.scenesMap.getKeyAt(sceneIndex), delay);
-	}
-	/**
-	 * This loads the fonts for fps and logPane from the skin file. This is called by Asset once the
-	 * assets are done loading
-	 * */
-	static void setup(){
-		fpsLabel = new Label("", Asset.skin);
-		fpsLabel.setName("Fps");
-	}
-	public static void addActor(Actor actor){
-		if(actor != null)
-			stage2d.addActor(actor);
-	}
-	public static void addActor(Actor actor, float x, float y){
-		if(actor != null){
-			actor.setPosition(x, y);
-			stage2d.addActor(actor);
-		}
-	}
-	public static void addActorWithDelay(final Actor actor, float delay){
-		Timer.schedule(new Task(){
-			@Override
-			public void run() {
-				addActor(actor);
-			}
-		}, delay);
-	}
-	/* If you want to make any elements/actors to move along with the camera
-	* like HUD's add them using this method */
-	public static void addHud(Actor actor){
-		if(actor != null){
-			addActor(actor);
-			hudActors.add(actor);
-		}
-	}
-	/* If you want to any elements/actors which was a Hud the use this */
-	public static void removeHud(Actor actor){
-		removeActor(actor);
-		hudActors.removeValue(actor, false);
-	}
-	public static void clearAllHud(){
-		hudActors.clear();
-	}
-	public static boolean removeActor(Actor actor){
-		return stage2d.getRoot().removeActor(actor);
-	}
-	public static boolean removeActor(String actorName){
-		return removeActor(findActor(actorName));
-	}
-	public static void removeActorWithDelay(Actor actor, float delay){
-		addAction(Actions.sequence(Actions.delay(delay), Actions.removeActor(actor)));
-	}
-	public static void addAction(Action action) {
-		stage2d.addAction(action);
-	}
-	public static void removeAction(Action action) {
-		stage2d.getRoot().removeAction(action);
-	}
-	public static Actor findActor(String actorName){
-		return stage2d.getRoot().findActor(actorName);
-	}
-	/*
-	 * This method makes sure the actor is not null and actors's name is not null
-	 * or actor is not root/fps/shape
-	 */
-	public static boolean isValidActor(Actor actor){
-		if(actor != null){
-			String name = actor.getName();
-			if(name != null){
-				if(name.equals("Root") && name.equals("Fps") && name.equals("Shape")){
-					return false;
-				}
-				else{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	public static SnapshotArray<Actor> getChildren(){
-		return stage2d.getRoot().getChildren();
-	}
-	public static Actor hit(float x, float y){
-		return stage2d.getRoot().hit(x, y, true);
-	}
-	public static void clear(){
-		if(currentScene != null)
-			currentScene.onDispose();
-		usePan = false;
-		followActor(null);
-		hudActors.clear();
-		resetCamera();
-		stage2d.clear();
-	}
-	private static Image imgbg = null;
-	public static void setBackground(String texName) {
-		if(imgbg != null)
-			removeBackground();
-		if(Asset.tex(texName) != null){
-			imgbg = new Image(new TextureRegionDrawable(Asset.tex(texName)), Scaling.stretch);
-			imgbg.setFillParent(true);
-			stage2d.addActor(imgbg);
-			imgbg.toBack();
-		}
-	}
-	public static void removeBackground() {
-		stage2d.getRoot().removeActor(imgbg);
-	}
-	public static void showToast(String message, float duration){
-		Table table = new Table(Asset.skin);
-		table.add("   "+message+"   ");
-		table.setBackground(Asset.skin.getDrawable("dialogDim"));
-		table.pack();
-		table.setPosition(targetWidth/2 - table.getWidth(), targetHeight/2 - table.getHeight());
-		addActor(table);
-		table.addAction(Actions.sequence(Actions.delay(duration), Actions.removeActor(table)));
-	}
-	public static void showMessageDialog(String title, String message){
-		Dialog dialog = new Dialog(title, Asset.skin);
-		dialog.getContentTable().add(message);
-		dialog.button("OK", "OK");
-		dialog.pack();
-		dialog.show(stage2d);
-	}
-	public static boolean showConfirmDialog(String title, String message){
-		Dialog dialog = new Dialog(title, Asset.skin);
-		dialog.button("Yes", "Yes");
-		dialog.button("No", "No");
-		dialog.pack();
-		dialog.show(stage2d);
-		//if(dialog.result().equals("Yes")) FIXME update Gdx
-		//	return true;
-		return false;
-	}
-/***********************************************************************************************************
-* 					Camera Related Functions											   		   	       *
-************************************************************************************************************/
-    private static float duration;
-    private static float time;
-	private static Interpolation interpolation;
-    private static boolean moveCompleted;
-    private static float lastPercent;
-    private static float percentDelta;
-    private static float panSpeedX, panSpeedY;
-    public void moveTo(float x, float y) {
-        moveTo(x, y, 0f);
-    }
-    public void moveTo(float x, float y, float duration) {
-        moveBy(x-camera.position.x, y-camera.position.y, duration);
-    }
-    public static void moveBy (float amountX, float amountY) {
-         moveBy(amountX, amountY, 0, null);
-    }
-    public static void moveBy (float amountX, float amountY, float duration) {
-         moveBy(amountX, amountY, duration, null);
-    }
-    public static void moveBy (float amountX, float amountY, float dur, Interpolation interp) {
-    	duration = dur;
-     	interpolation = interp;
-     	panSpeedX = amountX;
-     	panSpeedY = amountY;
-     	lastPercent = 0;
-     	time = 0;
-        moveCompleted = false;
-    }
-    private void moveByAction(float delta){
-        time += delta;
-        moveCompleted = time >= duration;
-        float percent;
-        if (moveCompleted)
-                percent = 1;
-        else {
-            percent = time / duration;
-            if (interpolation != null) percent = interpolation.apply(percent);
-        }
-        percentDelta = percent - lastPercent;
-    	camera.translate(panSpeedX * percentDelta, panSpeedY * percentDelta, 0);
-    	for(Actor actor: Stage.hudActors)
-    		actor.setPosition(actor.getX()+panSpeedX * percentDelta, actor.getY()+panSpeedY * percentDelta);
-        lastPercent = percent;
-        if (moveCompleted) interpolation = null;
-    }
-    public static void resetCamera(){
-    	camera.position.set(targetWidth/2, targetHeight/2, 0);
-    }
-	public static OrthographicCamera getCamera(){
-		return camera;
-	}
-    public static float getCameraWidth(){
-    	return camera.viewportWidth;
-    }
-    public static float getCameraHeight(){
-    	return camera.viewportHeight;
-    }
-    public static float getCameraX(){
-    	return camera.position.x;
-    }
-    public static float getCameraY(){
-    	return camera.position.y;
-    }
-    private static Actor followedActor = null;
-	private static float followSpeed = 1f;
-	private static float followTopOffset = 60;
-	private static float followLeftOffset = 10;
-	private static float followBotOffset = 70;
-	private static float followRightOffset = 10;
-	private static boolean followContinous = false;
-	/*
-	 * This makes the camera follow the actor once and only once. Once the camera reaches its
-	 * target, it stops following the actor.
-	 */
-	public static void followActor(Actor actor){
-	    followedActor = actor;
-	    followContinous = false;
-	}
-	/*
-	 * This makes the camera follow the actor continuously, even after the camera reaches its
-	 * target, it keeps following the if the actor changes its position.
-	 */
-	public static void followActorContinuously(Actor actor){
-	    followedActor = actor;
-	    followContinous = true;
-	}
-	/*
-	 *  This is to set the offsets of camera position when following the actor
-	 *  When the camera follows the actor its (x,y) position is set to actor's (x,y) position
-	 *  based on followSpeed. The offsets are used to position the camera in such a way that the actor
-	 *  doesn't need to be at the center of the camera always
-	 */
-    public static void setFollowActorOffset(float top, float left, float bot, float right){
-    	followTopOffset = top;
-    	followLeftOffset = left;
-    	followBotOffset = bot;
-    	followRightOffset = right;
-    }
-    /*
-     * Sets the speed at which the camera follows the actor. By default it moves 1px for a duration of 1f
-     * so its speed is 1px/f. So reduce the duration to increase its speed.
-     * ex: setPanSpeed(0.5) will change its speed to 2px/f
-     * Here: f can/maybe also indicate seconds
-     */
-    public static void setFollowSpeed(float duration){
-    	followSpeed = duration;
-    }
-    private void follow(){
-    	//if(camera.position.x == followedActor.getX()+followLeftOffset &&
-    	//	camera.position.y == followedActor.getY()+followTopOffset)
-    	//return;
-    	//moveTo(followedActor.getX()+followLeftOffset, followedActor.getY()+followTopOffset, 100f);
-    	if(camera.position.x < followedActor.getX() - followLeftOffset) moveBy(1f, 0, followSpeed);
-		else if(camera.position.x > followedActor.getX() + followRightOffset) moveBy(-1f, 0, followSpeed);
-		else if(camera.position.y < followedActor.getY() - followBotOffset) moveBy(0, 1f, followSpeed);
-		else if(camera.position.y > followedActor.getY() - followTopOffset) moveBy(0, -1f, followSpeed);
-		else {
-			if(!followContinous)
-				followedActor = null;
-		}
-    }
-    private void updateController(){
-    	mouse.x = Gdx.input.getX();
-    	mouse.y = Gdx.graphics.getHeight() - Gdx.input.getY();
-    	if(!moveCompleted)
-    		moveByAction(stateTime);
-		if(usePan)
-			panCameraWithMouse();
-		if(followedActor != null)
-			follow();
-    }
-/***********************************************************************************************************
-* 					2d Controller Related Functions												   	       *
-************************************************************************************************************/
-    public static boolean usePan;
-    private float panSpeed = 5f;
-    private float panXLeftOffset = 100;
-	private float panXRightOffset = 0;//Gdx.graphics.getWidth() - 100;
-	private float panYUpOffset = 70;
-	private float panYDownOffset = 0;//Gdx.graphics.getHeight() - 70;
-	public static float camOffsetX = 160f;
-	public static float camOffsetYTop = 110f;
-	public static float camOffsetYBot = 65f;
-	public static float mapOffsetX = 0;
-	public static float mapOffsetY = 0;
-	/*
-     * Sets the speed at which the camera pans. By default it moves 1px for a duration a 1f
-     * so its speed is 1px/f. So reduce the duration to increase its speed.
-     * ex: setPanSpeed(0.5) will change its speed to 2px/f
-     * Here: f can/maybe also indicate seconds
-     */
-	public void setPanSpeed(float duration){
-		panSpeed = duration;
-	}
-	/*
-	 *  This sets the boundary of the camera till what position can it move or pan in the
-	 *  directions left, right, top, down. This is to prevent is from panning overboard the game area.
-	 *  Usually the bounds of the camera is like a rectangle. This mus be calculated carefully
-	 *  as the camera's position is based on its center.
-	 */
-    public void setCameraBoundary(float xLeft, float xRight, float yUp, float dDown){
-    	panXLeftOffset = xLeft;
-    	panXRightOffset = xRight;
-    	panYUpOffset = yUp;
-    	panYDownOffset = dDown;
-    }
-    public void setCamOffset(float xOffset, float yOffsetTop, float yOffsetBot){
-    	camOffsetX = xOffset;
-    	camOffsetYTop = yOffsetTop;
-    	camOffsetYBot = yOffsetBot;
-    }
-    private void panCameraWithMouse(){
-    	if(mouse.x > panXRightOffset && camera.position.x < mapOffsetX - 5) moveBy(1f, 0, panSpeed);
-    	else if(mouse.x < panXLeftOffset && camera.position.x > camOffsetX +5)  moveBy(-1f, 0, panSpeed);
-    	else if(mouse.y < panYUpOffset && camera.position.y < mapOffsetY -5) moveBy(0, 1f, panSpeed);
-    	else if(mouse.y > panYDownOffset && camera.position.y > camOffsetYBot +5) moveBy(0, -1f, panSpeed);
-    }
-	/*
-	 * Gesture related
-	 */
-	public static float touchDragIntervalRange = 200f; // 200px drag for a gesture event
-	public static float touchInitialX = 0.0f, touchInitialY = 0.0f;
-	public static float touchCurrentX = 0.0f, touchCurrentY = 0.0f;
-	public static float difX;
-	public static float difY;
-	public static float prevDifX;
-	public static float prevDifY;
-	public static float touchDifX;
-	public static float touchDifY;
-	public boolean isTouchDragInterval() {
-		difX = java.lang.Math.abs(touchInitialX - touchCurrentX);
-		difY = java.lang.Math.abs(touchInitialY - touchCurrentY);
-		if (difX > touchDragIntervalRange || difY > touchDragIntervalRange)
-			return true;
-		else
-			return false;
-	}
-	public static GestureType getGestureDirection() {
-		prevDifX = difX;
-		prevDifY = difY;
-		difX = java.lang.Math.abs(touchInitialX - touchCurrentX);
-		difY = java.lang.Math.abs(touchInitialY - touchCurrentY);
-		/**
-		 * Get minimal changes on drag
-		 * <p> checkMomentumChanges
-		 * EXAMPLE<br>
-		 * User drags finger to left, suddenly dragging to right without removing
-		 * his finger from the screen
-		 * */
-		if (prevDifX > difX || prevDifY > difY) {
-			touchInitialX = touchCurrentX;
-			touchInitialY = touchCurrentY;
-			//
-			difX = 0.0f;
-			difY = 0.0f;
-			prevDifX = 0.0f;
-			prevDifY = 0.0f;
-			/**
-			 * Set touch differences, optional, if you need amount of change from
-			 * initial touch to drag, USE THIS: on touchDrag, pan or similar mthods
-			 * */
-			touchDifX = java.lang.Math.abs(touchInitialX - touchCurrentX);
-			touchDifY = java.lang.Math.abs(touchInitialY - touchCurrentY);
-		}
-		if (touchInitialY < touchCurrentY && difY > difX) {
-			return GestureType.Up;
-		} else if (touchInitialY > touchCurrentY && difY > difX) {
-			return GestureType.Down;
-		} else if (touchInitialX < touchCurrentX && difY < difX) {
-			return GestureType.Right;
-		} else if (touchInitialX > touchCurrentX && difY < difX) {
-			return GestureType.Left;
-		} else {
-			return GestureType.None;
-		}
-	}
-	/* Dragging Camera Related */
-	private final static Vector3 curr = new Vector3();
-	private final static Vector3 last = new Vector3(-1, -1, -1);
-	private final static Vector3 deltaDrag = new Vector3();
-	private static float deltaCamX = 0;
-	private static float deltaCamY = 0;
-	private static void dragCam(int x, int y){
-		camera.unproject(curr.set(x, y, 0));
-    	if (!(last.x == -1 && last.y == -1 && last.z == -1)) {
-    		camera.unproject(deltaDrag.set(last.x, last.y, 0));
-    		deltaDrag.sub(curr);
-    		deltaCamX = deltaDrag.x + camera.position.x;
-    		deltaCamY = deltaDrag.y + camera.position.y;
-    		if(deltaCamX > camOffsetX && deltaCamX < mapOffsetX)
-    			moveBy(deltaDrag.x, 0);
-    		if(deltaCamY > camOffsetYBot && deltaCamY < mapOffsetY)
-    			moveBy(0, deltaDrag.y);
-    	}
-    	last.set(x, y, 0);
-    }
-	static boolean gestureStarted = false;
-	static Actor validActor = null;
-    private final static ClickListener touchInput = new ClickListener(){
-    	@Override
-    	public void clicked(InputEvent event, float x, float y){
-    		super.clicked(event, x, y);
-    		mouse.set(x, y);
-    		validActor = hit(x,y);
-    		if(isValidActor(validActor))
-    			currentScene.onClick(validActor);
-    	}
-		@Override
-		public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
-			mouse.set(x, y);
-			Stage.pointer = pointer;
-			Stage.button = button;
-			touchInitialX = x;
-			touchInitialY = y;
-			gestureStarted = true;
-			validActor = hit(x,y);
-			if(isValidActor(validActor))
-				currentScene.onTouchDown(validActor);
-			return super.touchDown(event, x, y, pointer, button);
-		}
-		@Override
-		public void touchDragged(InputEvent event, float x, float y, int pointer){
-			super.touchDragged(event, x, y, pointer);
-			mouse.set(x, y);
-			Stage.pointer = pointer;
-			currentScene.onDragged();
-			if(gestureStarted == true){
-				touchCurrentX = x;
-				touchCurrentY = y;
-				if(getGestureDirection() != GestureType.None){
-					gestureStarted = false;
-					currentScene.onGesture(getGestureDirection());
-				}
-			}
-			if(Config.useDrag)
-				dragCam((int)x, (int)-y);
-		}
-		@Override
-		public void touchUp(InputEvent event, float x, float y, int pointer, int button){
-			super.touchUp(event, x, y, pointer, button);
-			mouse.set(x, y);
-			Stage.pointer = pointer;
-			Stage.button = button;
-			// reset Gesture
-			difX = 0.0f;
-			difY = 0.0f;
-			touchInitialX = 0.0f;
-			touchInitialY = 0.0f;
-			touchCurrentX = 0.0f;
-			touchCurrentY = 0.0f;
-			touchDifX = 0.0f;
-			touchDifY = 0.0f;
-			prevDifX = 0.0f;
-			prevDifY = 0.0f;
-			// reset Gesture
-			currentScene.onTouchUp();
-			last.set(-1, -1, -1);
-			gestureStarted = false;
-		}
-		@Override
-		public boolean keyTyped(InputEvent event, char key) {
-			currentScene.onKeyTyped(key);
-			return super.keyUp(event, key);
-		}
-		@Override
-		public boolean keyUp(InputEvent event, int keycode) {
-			currentScene.onKeyUp(keycode);
-			return super.keyUp(event, keycode);
-		}
-		@Override
-		public boolean keyDown(InputEvent event, int keycode) {
-			currentScene.onKeyDown(keycode);
-			return super.keyDown(event, keycode);
-		}
-	};
-/***********************************************************************************************************
-* 					3d Related Functions												   	       		   *
-************************************************************************************************************/
-	public static void addActor3d(Actor3d actor3d){
-		stage3d.addActor3d(actor3d);
-	}
-	public static void removeActor3d(Actor3d actor3d){
-		stage3d.getRoot().removeActor3d(actor3d);
-	}
-	public static void clear3d(){
-		stage3d.clear();
-	}
-	public static void getChildren3d(){
-		stage3d.getActors3d();
-	}
-	public static void removeActor3d(String actor3dName){
-		stage3d.getRoot().removeActor3d(stage3d.getRoot().findActor3d(actor3dName));
-	}
-	public static void resetCamera3d(){
-		stage3d.getCamera().position.set(10f, 10f, 10f);
-		stage3d.getCamera().lookAt(0,0,0);
-		stage3d.getCamera().near = 0.1f;
-		stage3d.getCamera().far = 300f;
-    }
-	public static PerspectiveCamera getCamera3d(){
-		return stage3d.getCamera();
-	}
-/***********************************************************************************************************
-* 					Utilities Related Functions												   	       		   *
-************************************************************************************************************/
-	/*
-	 * The the angle in degrees of the inclination of a line
-	 * @param cx, cy The center point x, y
-	 * @param tx, ty The target point x, y
-	 */
-	public static float getAngle(float cx, float cy, float tx, float ty) {
-	    float angle = (float) Math.toDegrees(MathUtils.atan2(tx - cx, ty - cy));
-	    //if(angle < 0){
-	    //    angle += 360;
-	    //}
-	    return angle;
-	}
-	private static Vector2 distVector = new Vector2();
-	public static final float getDistance(Actor a, Actor b){
-		distVector.set(a.getX(), a.getY());
-		return distVector.dst(b.getX(), b.getY());
-	}
-	public static final float getDistance(float x1, float y1, float x2, float y2){
-		distVector.set(x1, y1);
-		return distVector.dst(x2, y2);
-	}
-	/*
-	 * Capitalizes the First Letter of a String
-	 */
-	public static String capitalize(String text){
-		if(text != null && text != "")
-			return (text.substring(0, 1)).toUpperCase() + text.substring(1);
-		else
-			return "";
-	}
-	/*
-	 * UnCapitalizes the First Letter of a String
-	 */
-	public static String uncapitalize(String text){
-		return text.substring(0, 1).toLowerCase()+text.substring(1);
-	}
-	public static Rectangle getBounds(Actor actor) {
-		float posX = actor.getX();
-		float posY = actor.getY();
-		float width = actor.getWidth();
-		float height = actor.getHeight();
-		return new Rectangle(posX, posY, width, height);
-	}
-	public static boolean collides(Actor actor, float x, float y) {
-		Rectangle rectA1 = getBounds(actor);
-		Rectangle rectA2 = new Rectangle(x, y, 5, 5);
-		// Check if rectangles collides
-		if (Intersector.overlaps(rectA1, rectA2)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	public static boolean collides(Actor actor1, Actor actor2) {
-		Rectangle rectA1 = getBounds(actor1);
-		Rectangle rectA2 = getBounds(actor2);
-		// Check if rectangles collides
-		if (Intersector.overlaps(rectA1, rectA2)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	/*
-	 * TEA Encryption and Decryption
-	 */
-	public static String encryptKey = "Default";
-	private static final int encryptDelta = 0x9E3779B9;
-	private static final int MX(int sum, int y, int z, int p, int e, int[] k) {
-		return (z >>> 5 ^ y << 2) + (y >>> 3 ^ z << 4) ^ (sum ^ y) + (k[p & 3 ^ e] ^ z);
-	}
-	public static final byte[] encrypt(String data) {
-		return encrypt(data.getBytes(), encryptKey.getBytes());
-	}
-	public static final byte[] decrypt(String data) {
-		return decrypt(data.getBytes(), encryptKey.getBytes());
-	}
-	public static final byte[] encrypt(String data, String key) {
-		return encrypt(data.getBytes(), key.getBytes());
-	}
-	public static final byte[] decrypt(String data, String key) {
-		return decrypt(data.getBytes(), key.getBytes());
-	}
-	private static final byte[] encrypt(byte[] data, byte[] key) {
-		if (data.length == 0)
-			return data;
-		return toByteArray(encrypt(toIntArray(data, true), toIntArray(key, false)), false);
-	}
-	private static final byte[] decrypt(byte[] data, byte[] key) {
-		if (data.length == 0)
-			return data;
-		return toByteArray(decrypt(toIntArray(data, false), toIntArray(key, false)), true);
-	}
-	private static final int[] encrypt(int[] v, int[] k) {
-		int n = v.length - 1;
-		if (n < 1) {
-			return v;
-		}
-		if (k.length < 4) {
-			int[] key = new int[4];
-			System.arraycopy(k, 0, key, 0, k.length);
-			k = key;
-		}
-		int z = v[n], y = v[0], sum = 0, e;
-		int p, q = 6 + 52 / (n + 1);
-		while (q-- > 0) {
-			sum = sum + encryptDelta;
-			e = sum >>> 2 & 3;
-	for (p = 0; p < n; p++) {
-		y = v[p + 1];
-		z = v[p] += MX(sum, y, z, p, e, k);
-	}
-	y = v[0];
-	z = v[n] += MX(sum, y, z, p, e, k);
-		}
-		return v;
-	}
-	private static final int[] decrypt(int[] v, int[] k) {
-		int n = v.length - 1;
-		if (n < 1) {
-			return v;
-		}
-		if (k.length < 4) {
-			int[] key = new int[4];
-			System.arraycopy(k, 0, key, 0, k.length);
-			k = key;
-		}
-		int z = v[n], y = v[0], sum, e;
-		int p, q = 6 + 52 / (n + 1);
-		sum = q * encryptDelta;
-		while (sum != 0) {
-			e = sum >>> 2 & 3;
-		for (p = n; p > 0; p--) {
-			z = v[p - 1];
-			y = v[p] -= MX(sum, y, z, p, e, k);
-		}
-		z = v[n];
-		y = v[0] -= MX(sum, y, z, p, e, k);
-		sum = sum - encryptDelta;
-		}
-		return v;
-	}
-	private static final int[] toIntArray(byte[] data, boolean includeLength) {
-		int n = (((data.length & 3) == 0)
-				? (data.length >>> 2)
-						: ((data.length >>> 2) + 1));
-		int[] result;
-		if (includeLength) {
-			result = new int[n + 1];
-			result[n] = data.length;
-		}
-		else {
-			result = new int[n];
-		}
-		n = data.length;
-		for (int i = 0; i < n; i++) {
-			result[i >>> 2] |= (0x000000ff & data[i]) << ((i & 3) << 3);
-		}
-		return result;
-	}
-	private static final byte[] toByteArray(int[] data, boolean includeLength) {
-		int n = data.length << 2;
-		if (includeLength) {
-			int m = data[data.length - 1];
-			if (m > n) {
-				return null;
-			}
-			else {
-				n = m;
-			}
-		}
-		byte[] result = new byte[n];
-		for (int i = 0; i < n; i++) {
-			result[i] = (byte) ((data[i >>> 2] >>> ((i & 3) << 3)) & 0xff);
-		}
-		return result;
-	}
-}

Stage/Stage3d.java DELETED Viewed

@@ -1,488 +0,0 @@
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.InputAdapter;
-import com.badlogic.gdx.graphics.Camera;
-import com.badlogic.gdx.graphics.PerspectiveCamera;
-import com.badlogic.gdx.graphics.g3d.Environment;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
-import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute;
-import com.badlogic.gdx.graphics.g3d.environment.DirectionalLight;
-import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.scenes.scene2d.Group;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.Pool.Poolable;
-public class Stage3d extends InputAdapter implements Disposable {
-	private float width, height;
-	private ModelBatch modelBatch;
-	private Environment environment;
-	public ModelBuilder modelBuilder;
-    private PerspectiveCamera camera;
-    private Group3d root;
-	private Actor3d scrollFocus;
-	private Actor3d keyboardFocus;
-    /** Creates a stage with a {@link #setViewport(float, float, boolean) viewport} equal to the device screen resolution. The stage
-	 * will use its own {@link SpriteBatch}. */
-	public Stage3d () {
-		this(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), false);
-	}
-	/** Creates a stage with the specified {@link #setViewport(float, float, boolean) viewport} that doesn't keep the aspect ratio.
-	 * The stage will use its own {@link SpriteBatch}, which will be disposed when the stage is disposed. */
-	public Stage3d (float width, float height) {
-		this(width, height, false);
-	}
-	/** Creates a stage with the specified {@link #setViewport(float, float, boolean) viewport}. The stage will use its own
-	 * {@link SpriteBatch}, which will be disposed when the stage is disposed. */
-	public Stage3d (float width, float height, boolean keepAspectRatio) {
-		this.width = width;
-		this.height = height;
-		root = new Group3d();
-    	root.setStage3d(this);
-    	modelBatch = new ModelBatch();
-    	camera =  new PerspectiveCamera(67, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-    	camera.position.set(10f, 10f, 10f);
-    	camera.lookAt(0,0,0);
-    	camera.near = 0.1f;
-    	camera.far = 300f;
-    	camera.update();
-    	environment = new Environment();
-    	environment.set(new ColorAttribute(ColorAttribute.AmbientLight, 0.4f, 0.4f, 0.4f, 1f));
-        environment.add(new DirectionalLight().set(0.8f, 0.8f, 0.8f, -1f, -0.8f, -0.2f));
-		setViewport(width, height, keepAspectRatio);
-		modelBuilder = new ModelBuilder();
-	}
-	/** Sets up the stage size using a viewport that fills the entire screen without keeping the aspect ratio.
-	 * @see #setViewport(float, float, boolean, float, float, float, float) */
-	public void setViewport (float width, float height) {
-		setViewport(width, height, false, 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-	}
-	/** Sets up the stage size using a viewport that fills the entire screen.
-	 * @see #setViewport(float, float, boolean, float, float, float, float) */
-	public void setViewport (float width, float height, boolean keepAspectRatio) {
-		setViewport(width, height, keepAspectRatio, 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-	}
-	/** Sets up the stage size and viewport. The viewport is the glViewport position and size, which is the portion of the screen
-	 * used by the stage. The stage size determines the units used within the stage, depending on keepAspectRatio:
-	 * <p>
-	 * If keepAspectRatio is false, the stage is stretched to fill the viewport, which may distort the aspect ratio.
-	 * <p>
-	 * If keepAspectRatio is true, the stage is first scaled to fit the viewport in the longest dimension. Next the shorter
-	 * dimension is lengthened to fill the viewport, which keeps the aspect ratio from changing. The {@link #getGutterWidth()} and
-	 * {@link #getGutterHeight()} provide access to the amount that was lengthened.
-	 * @param viewportX The top left corner of the viewport in glViewport coordinates (the origin is bottom left).
-	 * @param viewportY The top left corner of the viewport in glViewport coordinates (the origin is bottom left).
-	 * @param viewportWidth The width of the viewport in pixels.
-	 * @param viewportHeight The height of the viewport in pixels. */
-	public void setViewport (float stageWidth, float stageHeight, boolean keepAspectRatio, float viewportX, float viewportY,
-		float viewportWidth, float viewportHeight) {
-		if (keepAspectRatio) {
-			if (viewportHeight / viewportWidth < stageHeight / stageWidth) {
-				float toViewportSpace = viewportHeight / stageHeight;
-				float toStageSpace = stageHeight / viewportHeight;
-				float deviceWidth = stageWidth * toViewportSpace;
-				float lengthen = (viewportWidth - deviceWidth) * toStageSpace;
-				this.width = stageWidth + lengthen;
-				this.height = stageHeight;
-			} else {
-				float toViewportSpace = viewportWidth / stageWidth;
-				float toStageSpace = stageWidth / viewportWidth;
-				float deviceHeight = stageHeight * toViewportSpace;
-				float lengthen = (viewportHeight - deviceHeight) * toStageSpace;
-				this.height = stageHeight + lengthen;
-				this.width = stageWidth;
-			}
-		} else {
-			this.width = stageWidth;
-			this.height = stageHeight;
-		}
-		camera.viewportWidth = this.width;
-		camera.viewportHeight = this.height;
-	}
-    public void draw(){
-    	camera.update();
-        if (!root.isVisible()) return;
-        modelBatch.begin(camera);
-        root.drawChildren(modelBatch, environment);
-        modelBatch.end();
-    }
-    /** Calls {@link #act(float)} with {@link Graphics#getDeltaTime()}. */
-	public void act () {
-		act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
-	}
-	/** Calls the {@link Actor#act(float)} method on each actor in the stage. Typically called each frame. This method also fires
-	 * enter and exit events.
-	 * @param delta Time in seconds since the last frame. */
-	public void act(float delta) {
-		root.act(delta);
-	}
-	/** Adds an actor to the root of the stage.
-	 * @see Group#addActor(Actor)
-	 * @see Actor#remove() */
-	public void addActor3d(Actor3d actor3d) {
-		root.addActor3d(actor3d);
-	}
-	/** Adds an action to the root of the stage.
-	 * @see Group#addAction3d(Action) */
-	public void addAction3d(Action3d action3d) {
-		root.addAction3d(action3d);
-	}
-	/** Returns the root's child actors.
-	 * @see Group#getChildren() */
-	public Array<Actor3d> getActors3d() {
-		return root.getChildren();
-	}
-	/** Adds a listener to the root.
-	 * @see Actor#addListener(EventListener) */
-	public boolean addListener (Event3dListener listener) {
-		return root.addListener(listener);
-	}
-	/** Removes a listener from the root.
-	 * @see Actor#removeListener(EventListener) */
-	public boolean removeListener (Event3dListener listener) {
-		return root.removeListener(listener);
-	}
-	/** Removes the root's children, actions, and listeners. */
-	public void clear () {
-		unfocusAll();
-		root.clear();
-	}
-	/** Removes the touch, keyboard, and scroll focused actors. */
-	public void unfocusAll () {
-		scrollFocus = null;
-		keyboardFocus = null;
-		//cancelTouchFocus();
-	}
-	/** Removes the touch, keyboard, and scroll focus for the specified actor and any descendants. */
-	public void unfocus(Actor3d actor) {
-		if (scrollFocus != null && scrollFocus.isDescendantOf(actor)) scrollFocus = null;
-		if (keyboardFocus != null && keyboardFocus.isDescendantOf(actor)) keyboardFocus = null;
-	}
-	/** Sets the actor that will receive key events.
-	 * @param actor May be null. */
-	public void setKeyboardFocus (Actor3d actor) {
-		if (keyboardFocus == actor) return;
-	}
-	/** Gets the actor that will receive key events.
-	 * @return May be null. */
-	public Actor3d getKeyboardFocus () {
-		return keyboardFocus;
-	}
-	/** Sets the actor that will receive scroll events.
-	 * @param actor May be null. */
-	public void setScrollFocus(Actor3d actor) {
-		if (scrollFocus == actor) return;
-	}
-	/** Gets the actor that will receive scroll events.
-	 * @return May be null. */
-	public Actor3d getScrollFocus () {
-		return scrollFocus;
-	}
-	public ModelBatch getModelBatch () {
-		return modelBatch;
-	}
-	public PerspectiveCamera getCamera () {
-		return camera;
-	}
-	/** Sets the stage's camera. The camera must be configured properly or {@link #setViewport(float, float, boolean)} can be called
-	 * after the camera is set. {@link Stage#draw()} will call {@link Camera#update()} and use the {@link Camera#combined} matrix
-	 * for the SpriteBatch {@link SpriteBatch#setProjectionMatrix(com.badlogic.gdx.math.Matrix4) projection matrix}. */
-	public void setCamera (PerspectiveCamera camera) {
-		this.camera = camera;
-	}
-	/** Returns the root group which holds all actors in the stage. */
-	public Group3d getRoot () {
-		return root;
-	}
-	public Environment getEnvironment(){
-		return environment;
-	}
-	@Override
-	public void dispose() {
-		clear();
-		modelBatch.dispose();
-	}
-}
-class Event3d implements Poolable {
-    private Stage3d stage;
-    private Actor3d targetActor;
-    private Actor3d listenerActor;
-    private boolean capture; // true means event occurred during the capture phase
-    private boolean bubbles = true; // true means propagate to target's parents
-    private boolean handled; // true means the event was handled (the stage will eat the input)
-    private boolean stopped; // true means event propagation was stopped
-    private boolean cancelled; // true means propagation was stopped and any action that this event would cause should not happen
-    /** Marks this event as handled. This does not affect event propagation inside scene2d, but causes the {@link Stage}
-     * event methods to return false, which will eat the event so it is not passed on to the application under the stage. */
-    public void handle () {
-            handled = true;
-    }
-    /** Marks this event cancelled. This {@link #handle() handles} the event and {@link #stop() stops} the event
-     * propagation. It also cancels any default action that would have been taken by the code that fired the event. Eg, if the
-     * event is for a checkbox being checked, cancelling the event could uncheck the checkbox. */
-    public void cancel () {
-            cancelled = true;
-            stopped = true;
-            handled = true;
-    }
-    /** Marks this event has being stopped. This halts event propagation. Any other listeners on the {@link #getListenerActor()
-     * listener actor} are notified, but after that no other listeners are notified. */
-    public void stop () {
-            stopped = true;
-    }
-    public void reset () {
-            stage = null;
-            targetActor = null;
-            listenerActor = null;
-            capture = false;
-            bubbles = true;
-            handled = false;
-            stopped = false;
-            cancelled = false;
-    }
-    /** Returns the actor that the event originated from. */
-    public Actor3d getTarget () {
-            return targetActor;
-    }
-    public void setTarget (Actor3d targetActor) {
-            this.targetActor = targetActor;
-    }
-    /** Returns the actor that this listener is attached to. */
-    public Actor3d getListenerActor () {
-            return listenerActor;
-    }
-    public void setListenerActor (Actor3d listenerActor) {
-            this.listenerActor = listenerActor;
-    }
-    public boolean getBubbles () {
-            return bubbles;
-    }
-    /** If true, after the event is fired on the target actor, it will also be fired on each of the parent actors, all the way to
-     * the root. */
-    public void setBubbles (boolean bubbles) {
-            this.bubbles = bubbles;
-    }
-    /** {@link #handle()} */
-    public boolean isHandled () {
-            return handled;
-    }
-    /** @see #stop() */
-    public boolean isStopped () {
-            return stopped;
-    }
-    /** @see #cancel() */
-    public boolean isCancelled () {
-            return cancelled;
-    }
-    public void setCapture (boolean capture) {
-            this.capture = capture;
-    }
-    /** If true, the event was fired during the capture phase.
-     * @see Actor#fire(Event) */
-    public boolean isCapture () {
-            return capture;
-    }
-    public void setStage (Stage3d stage) {
-            this.stage = stage;
-    }
-    /** The stage for the actor the event was fired on. */
-    public Stage3d getStage () {
-            return stage;
-    }
-}
-interface Event3dListener {
-    public boolean handle (Event3d event);
-}
-class InputEvent3d extends Event3d {
-    private Type type;
-    private float stageX, stageY, stageZ;
-    private int pointer, button, keyCode, scrollAmount;
-    private char character;
-    private Actor3d relatedActor;
-    public void reset () {
-            super.reset();
-            relatedActor = null;
-            button = -1;
-    }
-    /** The stage x coordinate where the event occurred. Valid for: touchDown, touchDragged, touchUp, mouseMoved, enter, and exit. */
-    public float getStageX () {
-            return stageX;
-    }
-    public void setStageX (float stageX) {
-            this.stageX = stageX;
-    }
-    /** The stage x coordinate where the event occurred. Valid for: touchDown, touchDragged, touchUp, mouseMoved, enter, and exit. */
-    public float getStageY () {
-            return stageY;
-    }
-    public void setStageY (float stageY) {
-            this.stageY = stageY;
-    }
-    /** The type of input event. */
-    public Type getType () {
-            return type;
-    }
-    public void setType (Type type) {
-            this.type = type;
-    }
-    /** The pointer index for the event. The first touch is index 0, second touch is index 1, etc. Always -1 on desktop. Valid for:
-     * touchDown, touchDragged, touchUp, enter, and exit. */
-    public int getPointer () {
-            return pointer;
-    }
-    public void setPointer (int pointer) {
-            this.pointer = pointer;
-    }
-    /** The index for the mouse button pressed. Always 0 on Android. Valid for: touchDown and touchUp.
-     * @see Buttons */
-    public int getButton () {
-            return button;
-    }
-    public void setButton (int button) {
-            this.button = button;
-    }
-    /** The key code of the key that was pressed. Valid for: keyDown and keyUp. */
-    public int getKeyCode () {
-            return keyCode;
-    }
-    public void setKeyCode (int keyCode) {
-            this.keyCode = keyCode;
-    }
-    /** The character for the key that was type. Valid for: keyTyped. */
-    public char getCharacter () {
-            return character;
-    }
-    public void setCharacter (char character) {
-            this.character = character;
-    }
-    /** The amount the mouse was scrolled. Valid for: scrolled. */
-    public int getScrollAmount () {
-            return scrollAmount;
-    }
-    public void setScrollAmount (int scrollAmount) {
-            this.scrollAmount = scrollAmount;
-    }
-    /** The actor related to the event. Valid for: enter and exit. For enter, this is the actor being exited, or null. For exit,
-     * this is the actor being entered, or null. */
-    public Actor3d getRelatedActor () {
-            return relatedActor;
-    }
-    /** @param relatedActor May be null. */
-    public void setRelatedActor (Actor3d relatedActor) {
-            this.relatedActor = relatedActor;
-    }
-    /** Sets actorCoords to this event's coordinates relative to the specified actor.
-     * @param actorCoords Output for resulting coordinates. */
-    public Vector3 toCoordinates (Actor3d actor, Vector3 actorCoords) {
-            actorCoords.set(stageX, stageY, stageZ);
-            //actor.stageToLocalCoordinates(actorCoords);
-            return actorCoords;
-    }
-    /** Returns true of this event is a touchUp triggered by {@link Stage#cancelTouchFocus()}. */
-    public boolean isTouchFocusCancel () {
-            return stageX == Integer.MIN_VALUE || stageY == Integer.MIN_VALUE;
-    }
-    public String toString () {
-            return type.toString();
-    }
-    /** Types of low-level input events supported by stage2d. */
-    static public enum Type {
-            /** A new touch for a pointer on the stage was detected */
-            touchDown,
-            /** A pointer has stopped touching the stage. */
-            touchUp,
-            /** A pointer that is touching the stage has moved. */
-            touchDragged,
-            /** The mouse pointer has moved (without a mouse button being active). */
-            mouseMoved,
-            /** The mouse pointer or an active touch have entered (i.e., {@link Actor#hit(float, float, boolean) hit}) an actor. */
-            enter,
-            /** The mouse pointer or an active touch have exited an actor. */
-            exit,
-            /** The mouse scroll wheel has changed. */
-            scrolled,
-            /** A keyboard key has been pressed. */
-            keyDown,
-            /** A keyboard key has been released. */
-            keyUp,
-            /** A keyboard key has been pressed and released. */
-            keyTyped
-    }
-}

Type/EffectType.java DELETED Viewed

@@ -1,10 +0,0 @@
-public enum EffectType {
-	None,
-	ScaleInOut, ScaleInOutLooping, ScaleInOutRemoveActor,
-	ShakeInOut, ShakeInOutLooping, ShakeInOutRemoveActor,
-	FadeInOut, FadeInOutLooping, FadeInOutRemoveActor,
-	FadeOutIn, FadeOutInLooping, FadeOutInRemoveActor,
-	ScaleToThenFadeOut, ScaleAndFadeOut, ScaleAndFadeIn,
-	PatrolX, PatrolY;
-}

Type/GestureType.java DELETED Viewed

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright 2013 pyros2097
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-public enum GestureType {
-	None, Up, Down, Left, Right
-}

Type/MovedListener.java DELETED Viewed

@@ -1,3 +0,0 @@
-public interface MovedListener {
-	public void onMoved();
-}

Type/OnEventType.java DELETED Viewed

@@ -1,5 +0,0 @@
-public enum OnEventType {
-	DoEffect,
-	SetScene
-}

Type/TransitionType.java DELETED Viewed

@@ -1,3 +0,0 @@
-public enum TransitionType {
-	None, leftToRight, rightToLeft, upToDown, downToUp ,FadeIn, FadeOut, ScaleIn, ScaleOut
-}

icon/background.png DELETED Viewed

Binary file

icon/style.png DELETED Viewed

Binary file

shots/shot1.png ADDED Viewed

Binary file

shots/shot2.png ADDED Viewed

Binary file

shots/shot3.png ADDED Viewed

Binary file

shots/shot4.png ADDED Viewed

Binary file

shots/shot5.png ADDED Viewed

Binary file

shots/shot6.png ADDED Viewed

Binary file

{IDE → src/gdxstudio}/Content.java RENAMED Viewed

@@ -1,3 +1,10 @@
+package gdxstudio;
+import gdxstudio.panel.AssetPanel;
+import gdxstudio.panel.ConsolePanel;
+import gdxstudio.panel.ReplacePanel;
+import gdxstudio.panel.StudioPanel;
+import gdxstudio.panel.WidgetPanel;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Insets;
@@ -30,19 +37,12 @@ final public class Content extends JPanel {
     public static StudioPanel studioPanel;
     private static ReplacePanel replacePanel;
 	public static AssetPanel assetPanel;
+	public static WidgetPanel widgetPanel;
 	private static ConsolePanel consolePanel;
-	private static String sceneFile = null;
-	private static Register sceneRegister;
-	private static Register viewRegister;
 	public static void initProjects(){
 		projectRegister = new Register(105);
 		projectFile = Register.getString(projectRegister);
-		sceneRegister = new Register(107);
-		sceneFile = Register.getString(sceneRegister);
-		viewRegister = new Register(109);
 	}
 	public Content(){
@@ -72,6 +72,10 @@ final public class Content extends JPanel {
         assetPanel = new AssetPanel();
         consolePanel = new ConsolePanel();
         assetPanel.setVisible(false);
+        widgetPanel = new WidgetPanel();
+        widgetPanel.setVisible(false);
+        vert.add(widgetPanel);
         vert.add(assetPanel);
         vert.add(consolePanel);
         add(vert, BorderLayout.SOUTH);
@@ -134,12 +138,15 @@ final public class Content extends JPanel {
 		consolePanel.setVisible(!consolePanel.isVisible());
 	}
+	public static void toggleWidget(){
+		widgetPanel.setVisible(!widgetPanel.isVisible());
+	}
     private static void showContent(String contentName){
     	if(currentView.equals(contentName))
     		return;
 		((CardLayout) card.getLayout()).show(card, contentName);
 		currentView = contentName;
-		Register.putString(viewRegister, contentName);
     }
 	public static boolean projectExists(){
@@ -157,19 +164,4 @@ final public class Content extends JPanel {
 		Register.putString(projectRegister, prjName);
 		projectFile = prjName;
 	}
-	public static boolean sceneFileExists(){
-		if(getSceneFile() == null || getSceneFile().isEmpty())
-			return false;
-		return true;
-	}
-	public static String getSceneFile(){
-		return sceneFile;
-	}
-	public static void setSceneFile(String sceneName){
-		Register.putString(sceneRegister, sceneName);
-		sceneFile = sceneName;
-	}
 }

{IDE → src/gdxstudio}/Editor.java RENAMED Viewed

@@ -1,3 +1,6 @@
+package gdxstudio;
+import gdxstudio.panel.ConsolePanel;
 import java.awt.Color;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -50,9 +53,7 @@ final public class Editor extends TextEditorPane {
         setLineWrap(true);
         setWrapStyleWord(true);
         setTabsEmulated(true);
-		if(Content.projectExists())
-			if(Content.sceneFileExists())
-				load();
+		load();
 		setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
 		LanguageSupportFactory lsf = LanguageSupportFactory.get();
 		LanguageSupport support = lsf.getSupportFor(SYNTAX_STYLE_JAVA);
@@ -95,8 +96,8 @@ final public class Editor extends TextEditorPane {
 	}
 	public void load(){
-		if(Content.sceneFileExists()){
+		if(Frame.scenePanel.selectedValueExists()){
-			setText(Export.readFile("source/"+Content.getSceneFile()+".java"));
+			setText(Export.readFile("source/"+Frame.scenePanel.getSelectedValue()+".java"));
 			setCaretPosition(0);
 			setDirty(false);
 		}
@@ -105,9 +106,9 @@ final public class Editor extends TextEditorPane {
 	@Override
 	public void save(){
 		if(isDirty()){
-			if(Content.sceneFileExists()){
+			if(Frame.scenePanel.selectedValueExists()){
-				Export.writeFile("source/"+Content.getSceneFile()+".java", getText());
+				Export.writeFile("source/"+Frame.scenePanel.getSelectedValue()+".java", getText());
-				ConsolePanel.compile();
+				ConsolePanel.compile(Frame.scenePanel.getSelectedValue());
 				setDirty(false);
 			}
 		}

{IDE → src/gdxstudio}/Export.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,14 +20,14 @@ import java.util.zip.ZipFile;
 import javax.swing.JOptionPane;
+import scene2d.Scene;
 import com.badlogic.gdx.utils.ArrayMap;
 public class Export {
 	private static final String[] frameWorkClasses = {
-		"Actions3d", "Action3d", "Actor3d", "Group3d", "Event3d", "InputEvent3d", "Scene3d", "Stage3d",
-		"Asset", "Config", "Effect", "ImageJson", "Map", "MapActor", "Net", "Scene", "Serializer",
-		"Sprite", "Stage", "Type", "Listener",
+		"scene2d", "scene3d",
 		"com/badlogic", "com/esotericsoftware", "gdx",
@@ -36,7 +37,8 @@ public class Export {
 	};
 	private static final String[] excludeClasses = {
-		"org/fife", "org/eclipse" , "com/threerings", "Panel", "tools", "web/laf"
+		"org/fife", "org/eclipse" , "com/threerings", "gdxstudio", "tools", "web/laf",
+		"android", "antlr"
 	};
 	private static final String eclipse_project =
@@ -83,7 +85,7 @@ public class Export {
 	public static void createProject(String foldername){
-		Main.log("Creating Project: "+Content.getProject());
+		GdxStudio.log("Creating Project: "+Content.getProject());
 		Content.setProject(foldername);
 		new File(Content.getProject()+"atlas").mkdir();
 		new File(Content.getProject()+"font").mkdir();
@@ -113,14 +115,14 @@ public class Export {
     	map.put("Version", "");
     	map.put("Target", "");
     	File prjFile = new File(Content.getProject());
-		Export.writeFile("config", Stage.json.toJson(map, ArrayMap.class));
+		Export.writeFile("config", Scene.json.toJson(map, ArrayMap.class));
 		Export.writeFile(".project", eclipse_project.replace("$$$", prjFile.getName()));
 		Frame.setEnabledProject();
 		createJar();
 	}
 	public static void openProject(String foldername){
-		Main.log("Opening Project: "+foldername);
+		GdxStudio.log("Opening Project: "+foldername);
 		Content.setProject(foldername);
 		Frame.setEnabledProject();
 	}
@@ -128,7 +130,7 @@ public class Export {
 	public static void writeFile(String filename, String data){
 		if(!Content.projectExists())
 			return;
-		Main.log("Writing File: "+filename);
+		GdxStudio.log("Writing File: "+filename);
 		File file = new File(Content.getProject()+filename);
 		try {
 			file.createNewFile();
@@ -145,7 +147,7 @@ public class Export {
 	public static String readFile(String filename){
 		if(!Content.projectExists())
 			return "";
-		Main.log("Reading File: "+filename);
+		GdxStudio.log("Reading File: "+filename);
 		StringBuffer sb = new StringBuffer();
 		File file = new File(Content.getProject()+filename);
 		if(!file.exists())
@@ -196,7 +198,7 @@ public class Export {
 	public static void deleteFile(String filename){
 		if(!Content.projectExists())
 			return;
-		Main.log("Deleting File: "+filename);
+		GdxStudio.log("Deleting File: "+filename);
 		try {
 			Files.delete(new File(Content.getProject()+filename).toPath());
 		} catch (IOException e) {
@@ -210,7 +212,7 @@ public class Export {
 	static{
 		manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
 		manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH, ". ");
-		manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "Stage");
+		manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "scene2d.desktop.Main");
 		manifest.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_VENDOR, "pyros2097");
 	}
@@ -220,7 +222,7 @@ public class Export {
 		String filename = Export.class.getProtectionDomain().getCodeSource().getLocation().getFile();
 		if(!filename.endsWith(".jar"))
 			return;
-		Main.log("Exporting Project: "+Content.getProject());
+		GdxStudio.log("Exporting Project: "+Content.getProject());
 		fileList.clear();
 		prjFile = new File(Content.getProject());
 		generateFileList(prjFile);
@@ -255,13 +257,16 @@ public class Export {
 	private static void generateFileList(File node){
 		if(node.isFile()){
-			if(!node.getName().contains("pack") && !node.getName().equals(prjFile.getName()+".jar")){
+			if(!node.getName().endsWith(".java") && !node.getName().equals(prjFile.getName()+".jar")
+				 && !node.getName().equals(prjFile.getName()+".apk")){
 				fileList.add(node);
 			}
 		}
 		else{
-			for(String filename : node.list())
+			for(String filename : node.list()){
+				if(!filename.equals("pack"))
-				generateFileList(new File(node, filename));
+					generateFileList(new File(node, filename));
+			}
 		}
 	}
@@ -282,8 +287,9 @@ public class Export {
 					if(!entryName.contains(excludeClasses[0]) && !entryName.contains(excludeClasses[1])
 						&& !entryName.contains(excludeClasses[2]) && !entryName.contains(excludeClasses[3])
 						&& !entryName.contains(excludeClasses[4]) && !entryName.contains(excludeClasses[5])
+						&& !entryName.contains(excludeClasses[6]) && !entryName.contains(excludeClasses[7])
 						&& entryName.contains(name)) {
-							Main.log(entryName);
+							//GdxStudio.log(entryName);
 							ZipEntry newEntry = new ZipEntry(entryName);
 							jos.putNextEntry(newEntry);
 							InputStream in = jf.getInputStream(je);

{IDE → src/gdxstudio}/Frame.java RENAMED Viewed

@@ -1,3 +1,19 @@
+package gdxstudio;
+import gdxstudio.panel.ActorPanel;
+import gdxstudio.panel.BaseList;
+import gdxstudio.panel.BaseTable;
+import gdxstudio.panel.ConsolePanel;
+import gdxstudio.panel.DashPanel;
+import gdxstudio.panel.EffectPanel;
+import gdxstudio.panel.EventPanel;
+import gdxstudio.panel.ProjectPanel;
+import gdxstudio.panel.ProjectSettingsPanel;
+import gdxstudio.panel.PropertyPanel;
+import gdxstudio.panel.SceneEffectPanel;
+import gdxstudio.panel.ScenePanel;
+import gdxstudio.panel.StudioPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.WindowEvent;
@@ -9,6 +25,8 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
+import scene2d.Asset;
+import scene2d.Scene;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -28,7 +46,6 @@ final public class Frame extends JFrame implements WindowListener{
 	public static ActorPanel actorPanel;
 	public static DashPanel dashPanel;
-	public static WidgetPanel widgetPanel;
 	public static PropertyPanel propertyPanel;
 	public static EffectPanel effectPanel;
 	public static EventPanel eventPanel;
@@ -57,7 +74,6 @@ final public class Frame extends JFrame implements WindowListener{
    	 	rightSideBar = new JPanel(new VerticalFlowLayout(0, 10));
    	 	UIUtils.setUndecorated(rightSideBar, true);
    	 	dashPanel = new DashPanel();
-   	 	widgetPanel = new WidgetPanel();
    	 	propertyPanel = new PropertyPanel();
    	 	effectPanel = new EffectPanel();
    	 	eventPanel = new EventPanel();
@@ -66,7 +82,6 @@ final public class Frame extends JFrame implements WindowListener{
    	 	//rightSideBar.add(new TablePanel("TT"));
    	 	rightSideBar.add(effectPanel);
    	 	rightSideBar.add(eventPanel);
-   	 	rightSideBar.add(widgetPanel);
    	 	leftSideBar = new JPanel(new VerticalFlowLayout(0, 10));
    	 	UIUtils.setUndecorated(leftSideBar, true);
@@ -106,20 +121,16 @@ final public class Frame extends JFrame implements WindowListener{
     public static void toggleLeftSideBar(){
     	leftSideBar.setVisible(!leftSideBar.isVisible());
+    	if(Content.studioPanel != null)
+    		Content.studioPanel.revalidateScreenPosition();
     }
     public static void toggleRightSideBar(){
     	rightSideBar.setVisible(!rightSideBar.isVisible());
+    	if(Content.studioPanel != null)
+    		Content.studioPanel.revalidateScreenPosition();
     }
-    public static void showRightSideBar(){
-    	rightSideBar.setVisible(true);
-    }
-    public static void toggleEditor(){
-		content.setVisible(!content.isVisible());
-	}
     private static void updateProject(){
     	Asset.loadAsynchronous = false;
 		Asset.setBasePath(Content.getProject());
@@ -258,8 +269,9 @@ final public class Frame extends JFrame implements WindowListener{
 	@Override
 	public void windowClosing(WindowEvent arg0) {
 		Content.editor.save();
+		Scene.getCurrentScene().save(scenePanel.getSelectedValue());
 		if(Content.studioPanel.canvas != null)
-			Stage.clear();
+			Scene.getRoot().clear();
 		//Stage.exit();
 		//Content.studioPanel.destroyCanvas();
 		dispose();

IDE/Main.java → src/gdxstudio/GdxStudio.java RENAMED Viewed

@@ -1,3 +1,7 @@
+package gdxstudio;
+import gdxstudio.panel.ConsolePanel;
+import gdxstudio.panel.StudioPanel;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -10,9 +14,10 @@ import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import scene2d.Asset;
 import web.laf.lite.widget.Register;
-public class Main {
+public class GdxStudio {
 	public static final String version = "0.7.1";
 	public static void main(String[] args) {

{IDE → src/gdxstudio}/Icon.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -7,12 +8,14 @@ import javax.swing.ImageIcon;
 import org.fife.ui.rsyntaxtextarea.Theme;
+import scene2d.Asset;
 public class Icon {
 	static String[] iconsList = new String[]{
 		"icon", "vs", "eclipse", "dark", "idea",
 		"trash", "help", "szoomout", "szoomin",
-		"sweblaf", "update", "style", "stexturepacker", "sparticle", "snuke",
+		"sweblaf", "update", "stexturepacker", "sparticle", "snuke",
 		"slibGDX", "shierologo", "shiero", "search", "screen", "sabout",
 		"packer", "options", "newprj", "newpack", "newfile", "lib", "level",
 		"high", "font", "find", "esource", "epackage",

src/gdxstudio/SceneEditor.java ADDED Viewed

@@ -0,0 +1,263 @@
+package gdxstudio;
+import java.awt.Cursor;
+import scene2d.Asset;
+import scene2d.Scene;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.Align;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Timer.Task;
+public class SceneEditor extends Scene {
+	public static Actor selectedActor = null;
+	public static boolean reloadAssets = false;
+	static AddField addField;
+	public SceneEditor(){
+		super();
+		if(reloadAssets){
+			Asset.loadBlocking();  // this is the first time this Scene is created by the Stage
+			Content.assetPanel.updateAsset();
+			com.badlogic.gdx.utils.Timer.schedule(new Task(){
+				@Override
+				public void run() {
+					Frame.scenePanel.showStudio();
+					Scene.scenesMap.removeKey("gdxstudio.SceneEditor");
+					Frame.scenePanel.update();
+				}
+			}, 1f);
+			reloadAssets = false;
+			addField = new AddField();
+		}
+		else{
+			Frame.scenePanel.showStudio();
+			Scene.scenesMap.removeKey("gdxstudio.SceneEditor");
+		}
+		Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+	}
+	public static void doClick(Actor actor){
+		addField.remove();
+		Frame.actorPanel.lock();
+		Frame.propertyPanel.clear();
+		Frame.effectPanel.clear();
+		Frame.eventPanel.clear();
+		selectedActor = actor;
+		Scene.getCurrentScene().outline(actor);
+		Frame.actorPanel.list.setSelectedIndex(Frame.actorPanel.indexOf(actor.getName()));
+		StatusBar.updateSelected(actor.getName());
+		Frame.dashPanel.update();
+		Frame.propertyPanel.update();
+		Frame.effectPanel.update();
+		Frame.eventPanel.update();
+		Frame.actorPanel.unlock();
+		if(selectedActor instanceof List || selectedActor instanceof SelectBox){
+			addField.setPosition(actor.getX(), actor.getY() - addField.getHeight());
+			Scene.getRoot().addActor(addField);
+		}
+	}
+	@Override
+	public void onClick(Actor actor) {
+		doClick(actor);
+	}
+	boolean dragging;
+	int edge;
+	float startX, startY, lastX, lastY;
+	@Override
+	public void onTouchDown(Actor actor) {
+		if (Scene.mouseButton == 0) {
+			edge = 0;
+			float x = Scene.mouse.x;
+			float y = Scene.mouse.y;
+			if (x > actor.getX() + actor.getWidth() - 10) edge |= Align.right;
+			if (y > actor.getY() + actor.getHeight() - 10) edge |= Align.top;
+			//if (x < actor.getX() + 20 && y < actor.getY() + 20) edge = Align.left; no rotation
+			dragging = edge != 0;
+			startX = x;
+			startY = y;
+			lastX = x;
+			lastY = y;
+		}
+	}
+	@Override
+	public void onTouchUp() {
+		dragging = false;
+		Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+	}
+	@Override
+	public void onDragged() {
+		if(selectedActor != null){
+			if(!dragging){
+				selectedActor.setPosition(Scene.mouse.x, Scene.mouse.y);
+				Frame.propertyPanel.updateProperty("X", ""+selectedActor.getX(), 0);
+				Frame.propertyPanel.updateProperty("Y", ""+selectedActor.getY(), 0);
+				StatusBar.updateXY(Scene.mouse.x, Scene.mouse.y);
+			}
+			else
+			{
+				float x = Scene.mouse.x;
+				float y = Scene.mouse.y;
+				float width = selectedActor.getWidth(), height = selectedActor.getHeight();
+				float windowX = selectedActor.getX(), windowY = selectedActor.getY();
+				if ((edge & Align.right) != 0) {
+					width += x - lastX;
+				}
+				if ((edge & Align.top) != 0) {
+					height += y - lastY;
+				}
+				if ((edge & Align.top) != 0 && (edge & Align.right) != 0) {
+					width += x - lastX;
+					height += y - lastY;
+				}
+				if (edge == Align.left){
+					float rot = getAngle(selectedActor.getX()+selectedActor.getOriginX(),
+							selectedActor.getY()+selectedActor.getOriginY(), x, y)
+							- selectedActor.getRotation();
+					selectedActor.rotate(rot);
+				}
+				lastX = x;
+				lastY = y;
+				selectedActor.setBounds(Math.round(windowX), Math.round(windowY), Math.round(width), Math.round(height));
+				Frame.propertyPanel.updateProperty("Width", ""+width, 0);
+				Frame.propertyPanel.updateProperty("Height", ""+height, 0);
+			}
+			Scene.isDirty = true;
+		}
+	}
+	@Override
+	public void onGesture(GestureType type) {
+	}
+	private boolean isHand = true;
+	private boolean isRight = false;
+	private boolean isTop = false;
+	@Override
+	public void act(float delta){
+		if(selectedActor != null){
+			isRight = false;
+			isTop = false;
+			//Stage.log("my"+Stage.mouse.y+"top"+selectedActor.getTop());
+			if (Scene.mouse.x > selectedActor.getRight() - 10 && Scene.mouse.x < selectedActor.getRight()) {
+				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
+				isHand = false;
+				isRight = true;
+			}
+			if(Scene.mouse.y > selectedActor.getTop() - 10 && Scene.mouse.y < selectedActor.getTop()){
+				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR));
+				isHand = false;
+				isTop = true;
+			}
+			if (isRight && isTop) {
+				Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.NE_RESIZE_CURSOR));
+				isHand = false;
+			}
+			if (!isRight && !isTop){
+				if(!isHand){
+					Content.studioPanel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+					isHand = true;
+				}
+			}
+		}
+	}
+	@Override
+	public void onKeyTyped(char key) {};
+	@Override
+	public void onKeyUp(int keycode){};
+	@Override
+	public void onKeyDown(int keycode){};
+	@Override
+	public void onPause(){};
+	@Override
+	public void onResume(){};
+	@Override
+	public void onDispose(){};
+}
+class AddField extends Table {
+	TextField tf;
+	TextButton addBtn;
+	TextButton removeBtn;
+	public AddField(){
+		super(Asset.skin);
+		setBackground(Asset.skin.getDrawable("dialogDim"));
+		tf = new TextField("", Asset.skin);
+		addBtn = new TextButton("Add", Asset.skin);
+		removeBtn = new TextButton("Remove", Asset.skin);
+		add(tf);
+		add(addBtn);
+		add(removeBtn);
+		pack();
+		addBtn.addListener(new ClickListener(){
+			@Override
+	    	public void clicked(InputEvent event, float x, float y){
+	    		super.clicked(event, x, y);
+	    		if(!tf.getText().isEmpty()){
+	    			if(SceneEditor.selectedActor instanceof List){
+	    				List list = (List) SceneEditor.selectedActor;
+	    				Array<String> arr = new Array<String>(list.getItems());
+	    				arr.add(tf.getText());
+	    				list.setItems(arr.toArray());
+	    				list.pack();
+	    				AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
+	    			}
+	    			if(SceneEditor.selectedActor instanceof SelectBox){
+	    				SelectBox list = (SelectBox) SceneEditor.selectedActor;
+	    				Array<String> arr = new Array<String>(list.getItems());
+	    				arr.add(tf.getText());
+	    				list.setItems(arr.toArray());
+	    				list.pack();
+	    				AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
+	    			}
+	    		}
+			}
+		});
+		removeBtn.addListener(new ClickListener(){
+			@Override
+	    	public void clicked(InputEvent event, float x, float y){
+	    		super.clicked(event, x, y);
+	    		if(SceneEditor.selectedActor instanceof List){
+		    		List list = (List) SceneEditor.selectedActor;
+		    		if(list.getItems().length == 0)
+		    			return;
+		    		Array<String> arr = new Array<String>(list.getItems());
+		    		list.setSelectedIndex(list.getItems().length-1);
+		    		arr.removeIndex(list.getSelectedIndex());
+		    		list.setItems(arr.toArray());
+		    		list.pack();
+		    		AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
+	    		}
+	    		if(SceneEditor.selectedActor instanceof SelectBox){
+	    			SelectBox list = (SelectBox) SceneEditor.selectedActor;
+		    		if(list.getItems().length == 0)
+		    			return;
+		    		Array<String> arr = new Array<String>(list.getItems());
+		    		list.setSelection(list.getItems().length-1);
+		    		arr.removeIndex(list.getSelectionIndex());
+		    		list.setItems(arr.toArray());
+		    		list.pack();
+		    		AddField.this.setPosition(list.getX(), list.getY()-AddField.this.getHeight());
+	    		}
+			}
+		});
+	}
+}

{IDE → src/gdxstudio}/SearchBar.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

{IDE → src/gdxstudio}/StatusBar.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -38,10 +39,10 @@ final public class StatusBar extends JPanel {
          add(caret, ToolbarLayout.START);
          addSpace();
          addSeparator();
-         addSpace();
+         //addSpace();
-         add(selected, ToolbarLayout.START);
+         //add(selected, ToolbarLayout.START);
-         addSpace();
+         //addSpace();
-         addSeparator();
+         //addSeparator();
          addSpace();
          add(xy, ToolbarLayout.START);
@@ -71,6 +72,12 @@ final public class StatusBar extends JPanel {
          initAsset();
          addSpace();
+         addSeparator();
+         addSpace();
+         initWidget();
+         addSpace();
          addSeparator();
          //initUpdate();
@@ -135,6 +142,17 @@ final public class StatusBar extends JPanel {
 		add(asset);
 	}
+	void initWidget(){
+		final JButton widget = Style.createMenuButton("<html><b>Widgets</b>");
+		widget.addActionListener(new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				Content.toggleWidget();
+			}
+		});
+		add(widget);
+	}
 	void initZoomIn(){
 		add(Style.createToolPanel("ZoomIn", "szoomin", new ActionListener(){
 			@Override

{IDE → src/gdxstudio}/Style.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.awt.Color;
 import java.awt.FlowLayout;
 import java.awt.GradientPaint;
@@ -90,22 +91,32 @@ public enum Style {
 	private static GradientPaint headerBgPaint;
 	private static final int margin = 15;
-	private static final int marginsub5 = 10;
-	private static final int margin5 = 20;
+	private static int screenX = 0;
+	private static int screenY = 0;
-	private static final int targetW = 800+55;
+	private static int screenW = 0;
-	private static final int targetH = 480;
+	private static int screenH = 0;
+	public static void setScreenPosition(int x, int y){
+		screenX = x - 5;
+		screenY = y + 5;
+	}
+	public static void setScreenSize(int width, int height){
+		screenW = width + 40;
+		screenH = height + 25;
+	}
-	final public static void drawScreen(Graphics g, int width, int height){
+	public static void drawScreen(Graphics g, int width, int height){
 		g.setColor(Style.canvasBg);
 		g.fillRect(0, 0, width, height); //bg
 		g.setColor(Color.black);
-		g.fillRoundRect(5, marginsub5, targetW+marginsub5, targetH+10, 10, 10);
+		g.fillRoundRect(screenX, screenY, screenW, screenH, 10, 10);
 		g.setColor(Style.canvasShadowBot);
-		g.drawLine(margin, targetH+margin5, targetW+marginsub5, targetH+margin5);//hoz shadow y same
+		g.drawLine(screenX+5, screenY+screenH, screenX+screenW-5, screenY+screenH);//hoz shadow y same
-		g.drawLine(targetW+margin, margin, targetW+margin, targetH+margin);// vert shadow x same
+		g.drawLine(screenX+screenW, screenY+5, screenX+screenW, screenY+screenH-5);// vert shadow x same
 		g.setColor(Style.canvasBox);
-		g.fillRect(0, targetH+3*margin, width, 2);
+		g.fillRect(0, screenH+3*margin, width, 2);
-		g.fillRect(0, targetH+3*margin+3, width, height-targetH+3*margin-3);
+		g.fillRect(0, screenH+3*margin+3, width, height-screenH+3*margin-3);
 	}
 	public static Color tableHeaderTopLineColor = new Color ( 232, 234, 235 );
@@ -184,6 +195,11 @@ public enum Style {
 			setHorizontalAlignment(JLabel.CENTER);
 			setForeground(Style.headerFg);
 		}
+		public TitleLabel(String text, String icon){
+			this(text);
+			setIcon(Icon.icon(icon));
+			setHorizontalTextPosition(JLabel.RIGHT);
+		}
 		@Override
 		public void setText(String text){
 			super.setText(text.toUpperCase());
@@ -221,9 +237,6 @@ public enum Style {
 			if(al != null)
 				addActionListener(al);
 		}
-		public TitleButton(String text){
-			this(text, null);
-		}
 		@Override
 		public void setText(String text){
 			super.setText(text.toUpperCase());
@@ -305,7 +318,7 @@ public enum Style {
 		JButton btn = new JButton(text,Icon.icon(ic));
 		UIUtils.setDrawFocus(btn, false);
 		UIUtils.setShadeWidth(btn, 0);
-		//UIUtils.setRound(btn, 0);
+		UIUtils.setRound(btn, 0);
 		viewGroup.add(btn);
 		btn.addActionListener(new ActionListener(){
 			@Override

{IDE → src/gdxstudio}/ToolBar.java RENAMED Viewed

@@ -1,3 +1,8 @@
+package gdxstudio;
+import gdxstudio.panel.ConsolePanel;
+import gdxstudio.panel.OptionsPanel;
+import gdxstudio.panel.ProjectPanel;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FileDialog;
@@ -15,18 +20,20 @@ import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
-import javax.swing.JToggleButton;
 import javax.swing.SwingConstants;
+import com.badlogic.gdx.tools.imagepacker.TexturePacker2;
+import com.badlogic.gdx.tools.imagepacker.TexturePacker2.Settings;
 import web.laf.lite.layout.HorizontalFlowLayout;
 import web.laf.lite.layout.ToolbarLayout;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.popup.ButtonPopup;
 import web.laf.lite.popup.PopupWay;
 import web.laf.lite.utils.UIUtils;
-import web.laf.lite.widget.Register;
 import web.laf.lite.widget.WebButtonGroup;
 final public class ToolBar extends JPanel {
@@ -41,11 +48,23 @@ final public class ToolBar extends JPanel {
         initAbout();
         initProject();
         initOpen();
+        initPack();
         initExport();
         addSeparator();
         initOptions();
-        initStyle();
         addSeparator();
+        add(Style.createToolPanel("Build", "esource", new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				ConsolePanel.build();
+			}
+	    }));
+        add(Style.createToolPanel("Compile", "esource", new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				Content.editor.save();
+			}
+	    }));
         add(Style.createToolPanel("Run", "go", new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
@@ -94,7 +113,7 @@ final public class ToolBar extends JPanel {
 				final JButton licenseBtn = new JButton("Apache License v2.0");
 				final JPanel author = new JPanel(new HorizontalFlowLayout());
 				final JPanel hoz = new JPanel(new HorizontalFlowLayout());
-				popupContent.add(UIUtils.setBoldFont(new JLabel("GdxStudio v"+Main.version)));
+				popupContent.add(UIUtils.setBoldFont(new JLabel("GdxStudio v"+GdxStudio.version)));
 				popupContent.add(new JSeparator(SwingConstants.HORIZONTAL));
 				author.setOpaque(false);
 				author.add(new JLabel("Created by: pyros2097"));
@@ -213,6 +232,31 @@ final public class ToolBar extends JPanel {
 		add(open);
 	}
+	void initPack(){
+		JButton packButton = Style.createMenuButton("Pack");
+		packButton.setIcon(Icon.icon("epackage"));
+    	packButton.addActionListener(new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				Settings settings = new Settings();
+				settings.maxWidth = 2048;
+		        settings.maxHeight = 2048;
+		        settings.paddingX = 0;
+		        settings.paddingY = 0;
+				TexturePacker2.process(settings, Content.getProject()+File.separator+"pack",
+						Content.getProject()+"atlas/", "pack.atlas");
+				for(File f: new File(Content.getProject()+File.separator+"pack").listFiles()){
+					if(f.isDirectory()){
+						TexturePacker2.process(settings, f.getPath(), Content.getProject()+"atlas/", f.getName());
+						JOptionPane.showMessageDialog(null, "Packed Texture: "+f.getName(), "Texture Packer",
+								JOptionPane.INFORMATION_MESSAGE);
+					}
+				}
+			}
+    	});
+		add(packButton);
+	}
 	void initExport(){
 		JButton export = Style.createMenuButton("Export");
 		export.setIcon(Icon.icon("export"));
@@ -238,7 +282,7 @@ final public class ToolBar extends JPanel {
 				dialog.getContentPane().setLayout(new BorderLayout());
 				dialog.getContentPane().add(optionsPanel);
 				dialog.pack();
-				dialog.setSize(525, 500);
+				dialog.setSize(525, 525);
 				Dimension Size = Toolkit.getDefaultToolkit().getScreenSize();
 				dialog.setLocation(new Double((Size.getWidth()/2) - (dialog.getWidth()/2)).intValue(),
 						new Double((Size.getHeight()/2) - (dialog.getHeight()/2)).intValue());
@@ -248,63 +292,20 @@ final public class ToolBar extends JPanel {
 	    }));
 	}
-	void initStyle(){
-		add(Style.createToolPanel("Style", "style", null));
-		UIUtils.setRound(Style.btnMap.get("style"), 10);
-        final ButtonPopup wbp = new ButtonPopup(Style.btnMap.get("style"), PopupWay.downRight);
-        wbp.setRound(0);
-        UIUtils.setRound(wbp, 0);
-        JPanel editorStyles = new JPanel ( new VerticalFlowLayout (5, 5) );
-        editorStyles.setOpaque(false);
-        UIUtils.setRound(editorStyles, 0);
-        UIUtils.setUndecorated(editorStyles, true);
-        ThemeButton[] themeButtons = {
-        		createThemeItem("IntelliJ IDEA", "idea"),
-        		createThemeItem("Dark", "dark"),
-        		createThemeItem("Visual Studio", "vs"),
-        		createThemeItem("Eclipse", "eclipse")
-        };
-        WebButtonGroup themeGroup = new WebButtonGroup(WebButtonGroup.VERTICAL, true, themeButtons);
-        themeGroup.setButtonsDrawFocus(false);
-        themeGroup.setButtonsDrawFocus(false);
-        editorStyles.add(themeGroup);
-        wbp.setContent (editorStyles);
-	}
-	ThemeButton createThemeItem(String title, String iconname){
-		final ThemeButton themeButton = new ThemeButton(title, iconname);
-		if(Register.getTheme().equals(iconname))
-			themeButton.setSelected(true);
-		themeButton .addActionListener (new ActionListener (){
-            public void actionPerformed (ActionEvent e){
-            	Register.setTheme(themeButton.iconame);
-            	Content.theme = Icon.loadTheme(themeButton.iconame);
-            	Content.theme.apply(Content.editor);
-           }
-        });
-		return themeButton;
-	}
 	void initView(){
-		JPanel pan = new JPanel(new VerticalFlowLayout(FlowLayout.CENTER, 0, 0));
-		UIUtils.setUndecorated(pan, true);
-		UIUtils.setShadeWidth(pan, 0);
-		UIUtils.setRound(pan, 0);
-		UIUtils.setDrawSides(pan, false, false, false, false);
         Style.viewButton("Editor", "editor");
         Style.viewButton("Studio", "studio");
         Style.viewButton("Hiero", "shiero");
         Style.viewButton("Particle", "sparticle");
-        WebButtonGroup textGroup = new WebButtonGroup(true,Style.viewGroup.toArray(new JButton[Style.viewGroup.size()]));
+        WebButtonGroup textGroup = new WebButtonGroup(true, Style.viewGroup.get(0), Style.viewGroup.get(1),
+        		Style.viewGroup.get(2), Style.viewGroup.get(3));
         textGroup.setButtonsDrawFocus(false);
         UIUtils.setUndecorated(textGroup, true);
-        UIUtils.setShadeWidth(textGroup, 1);
+        UIUtils.setShadeWidth(textGroup, 0);
-        UIUtils.setMargin(textGroup, new Insets(1, 0, 1, 0));
+        UIUtils.setMargin(textGroup, new Insets(0, 0, -1, 0));
         UIUtils.setRound(textGroup, 0);
         UIUtils.setDrawSides(textGroup, false, false, false, false);
-        pan.setOpaque(false);
-        pan.add(textGroup);
+        add(textGroup);
-        add(pan, ToolbarLayout.MIDDLE);
 	}
     public void addSpace(){
@@ -314,16 +315,4 @@ final public class ToolBar extends JPanel {
 	public void addSeparator(){
 		add(new JSeparator(SwingConstants.VERTICAL), ToolbarLayout.START);
 	}
-}
-final class ThemeButton extends JToggleButton{
-	private static final long serialVersionUID = 1L;
-	String iconame;
-	ThemeButton(String text, String ic){
-		super(text, Icon.icon(ic));
-		iconame = ic;
-		setVerticalTextPosition(SwingConstants.BOTTOM);
-        setHorizontalTextPosition(SwingConstants.CENTER);
-        setFocusable(false);
-	}
 }

{IDE → src/gdxstudio}/Update.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -123,7 +124,7 @@ public class Update extends JFrame implements PropertyChangeListener, ActionList
 			progressBar.setValue(0);
 			int serverFileLength = getContentLength("https://github.com/pyros2097/Scene3d/raw/master/libs/"+file);
 			long localFileLength = new File(workDir+"libs/"+file).length();
-			Main.log("serverFileLength:"+serverFileLength+" localFileLength:"+localFileLength);
+			GdxStudio.log("serverFileLength:"+serverFileLength+" localFileLength:"+localFileLength);
 			if(serverFileLength == localFileLength)
 				return;//continue;
 			AsyncDownloader as = new AsyncDownloader("https://github.com/pyros2097/Scene3d/raw/master/libs/", file);
@@ -141,7 +142,7 @@ public class Update extends JFrame implements PropertyChangeListener, ActionList
 		String line = "";
 		HttpURLConnection httpConn = openConnection("https://github.com/pyros2097/GdxStudio/raw/master/README.md");
 		if(httpConn == null)
-			return Main.version;
+			return GdxStudio.version;
 		if(isOK(httpConn)) {
 			try {
 				BufferedReader br = new BufferedReader(new InputStreamReader(httpConn.getInputStream()));
@@ -193,7 +194,7 @@ public class Update extends JFrame implements PropertyChangeListener, ActionList
 	}
 	private boolean checkNewVersion(){
-		String[] vals1 = Main.version.split("\\.");
+		String[] vals1 = GdxStudio.version.split("\\.");
 		String[] vals2 = getNewVersion().split("\\.");
 		int i=0;
 		while(i<vals1.length && i<vals2.length && vals1[i].equals(vals2[i])) {

{Panel → src/gdxstudio/panel}/ActorPanel.java RENAMED Viewed

@@ -1,3 +1,11 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Frame;
+import gdxstudio.SceneEditor;
+import gdxstudio.StatusBar;
+import gdxstudio.Style;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -6,6 +14,7 @@ import javax.swing.JComboBox;
 import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
+import scene2d.Scene;
 import web.laf.lite.widget.CenterPanel;
 import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -20,6 +29,8 @@ public class ActorPanel extends BaseList {
 	public static Actor copiedActor = null;
 	public static Actor cutActor = null;
+	public Component paste;
 	public ActorPanel(){
 		super("Actors", "");
@@ -29,8 +40,10 @@ public class ActorPanel extends BaseList {
 		tools.add(new CenterPanel(groupCombo, false, true));
 		add(tools);
 		add(scrollPane);
-		if(Content.sceneFileExists())
+		if(Frame.scenePanel.selectedValueExists())
-			setHeaderText(Content.getSceneFile());
+			setHeaderText(Frame.scenePanel.getSelectedValue());
+		paste = tools.getComponent(2);
+		paste.setEnabled(false);
 	}
 	public void addActor(String actorName){
@@ -78,7 +91,7 @@ public class ActorPanel extends BaseList {
 	@Override
 	public void valueChanged(ListSelectionEvent e) {
 		if (e.getValueIsAdjusting() == false) {
-			SceneEditor.doClick(Stage.findActor(list.getSelectedValue()));
+			SceneEditor.doClick(Scene.getCurrentScene().findActor(list.getSelectedValue()));
 		}
 	}
@@ -87,33 +100,45 @@ public class ActorPanel extends BaseList {
 		lock();
 		switch(((JButton)e.getSource()).getToolTipText()){
 		case "Cut":
+			if(list.getSelectedIndex() != -1){
-			cutActor = SceneEditor.selectedActor;
+				cutActor = SceneEditor.selectedActor;
-			copiedActor = null;
+				copiedActor = null;
-			listModel2.removeElement(SceneEditor.selectedActor.getName());
+				listModel2.removeElement(SceneEditor.selectedActor.getName());
-			Stage.removeActor(SceneEditor.selectedActor);
+				Scene.getCurrentScene().removeActor(SceneEditor.selectedActor);
+				paste.setEnabled(true);
+			}
 			break;
 		case "Copy":
+			if(list.getSelectedIndex() != -1){
-			String line = Stage.json.toJson(SceneEditor.selectedActor);
+				String line = Scene.json.toJson(SceneEditor.selectedActor);
-			copiedActor = Stage.json.fromJson(Actor.class, line);
+				copiedActor = Scene.json.fromJson(Actor.class, line);
-			cutActor = null;
+				cutActor = null;
+				paste.setEnabled(true);
+			}
 			break;
 		case "Paste":
 			if(cutActor != null){
 				Content.studioPanel.setName(cutActor);
 				cutActor = null;
+				paste.setEnabled(false);
 			}
 			if(copiedActor != null){
-				copiedActor = Stage.json.fromJson(Actor.class, Stage.json.toJson(SceneEditor.selectedActor));
+				copiedActor = Scene.json.fromJson(Actor.class, Scene.json.toJson(SceneEditor.selectedActor));
 				Content.studioPanel.setName(copiedActor);
 			}
+			Scene.isDirty = true;
 			break;
 		case "Delete":
+			if(list.getSelectedIndex() != -1){
-			Stage.removeActor(Stage.findActor(list.getSelectedValue()));
+				Scene.getCurrentScene().removeActor(SceneEditor.selectedActor);
-			StatusBar.updateSelected("None");
+				StatusBar.updateSelected("None");
+				if(contains(SceneEditor.selectedActor.getName()))
-			listModel2.removeElement(list.getSelectedValue());
+					listModel2.removeElement(SceneEditor.selectedActor.getName());
+				Scene.isDirty = true;
+			}
 			break;
 		}
 		unlock();

{Panel → src/gdxstudio/panel}/AssetPanel.java RENAMED Viewed

@@ -1,13 +1,8 @@
+package gdxstudio.panel;
+import gdxstudio.Style;
 import java.awt.Dimension;
-import java.awt.datatransfer.StringSelection;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragGestureListener;
 import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceDragEvent;
-import java.awt.dnd.DragSourceDropEvent;
-import java.awt.dnd.DragSourceEvent;
-import java.awt.dnd.DragSourceListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -17,12 +12,14 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
+import scene2d.Asset;
 import web.laf.lite.widget.CenterPanel;
-final public class AssetPanel extends BaseList implements DragSourceListener, DragGestureListener{
+final public class AssetPanel extends BaseList {
 	private static final long serialVersionUID = 1L;
-	private static String[] comboText = new String[]{"Font", "Texture", "Animation", "Music", "Sound", "Particle"};
+	private static String[] comboText = new String[]{"Font", "Texture", "Animation", "Music", "Sound", "Particle",
+		"Model"};
 	private static JComboBox<String> combo = new JComboBox<String>(comboText);
 	String[] btns = new String[]{
@@ -39,8 +36,6 @@ final public class AssetPanel extends BaseList implements DragSourceListener, Dr
 		pan.add(new CenterPanel(combo, false, true));
 		add(pan);
 		add(scrollPane);
-		dragSource.addDragSourceListener(this);
-	    dragSource.createDefaultDragGestureRecognizer(list, DnDConstants.ACTION_MOVE, this);
 	    combo.addItemListener(new ItemListener(){
 			@Override
 			public void itemStateChanged(ItemEvent e) {
@@ -72,6 +67,10 @@ final public class AssetPanel extends BaseList implements DragSourceListener, Dr
 				//	for(String names: Asset.musicMap.keys())
 				//		assetModel.addElement(names);
 				//	break;
+			case "Model":
+				for(Object names: Asset.modelMap.toArray())
+					listModel2.addElement(names.toString());
+				break;
 		}
 	}
@@ -80,42 +79,6 @@ final public class AssetPanel extends BaseList implements DragSourceListener, Dr
 		this.setVisible(false);
 	}
-	@Override
-	public void dragGestureRecognized(DragGestureEvent event) {
-	    StringSelection text = new StringSelection(combo.getSelectedItem().toString());
-	    dragSource.startDrag( event, DragSource.DefaultMoveDrop, text, this);
-	}
-	@Override
-	public void dragDropEnd(DragSourceDropEvent arg0) {
-		// TODO Auto-generated method stub
-	}
-	@Override
-	public void dragEnter(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
-	}
-	@Override
-	public void dragExit(DragSourceEvent arg0) {
-		// TODO Auto-generated method stub
-	}
-	@Override
-	public void dragOver(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
-	}
-	@Override
-	public void dropActionChanged(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
-	}
 	@Override
 	public void valueChanged(ListSelectionEvent arg0) {
 		// TODO Auto-generated method stub

{Panel → src/gdxstudio/panel}/BaseList.java RENAMED Viewed

@@ -1,3 +1,6 @@
+package gdxstudio.panel;
+import gdxstudio.Style;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -10,7 +13,6 @@ import java.util.TreeSet;
 import javax.swing.AbstractListModel;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -22,11 +24,11 @@ import web.laf.lite.utils.UIUtils;
 public abstract class BaseList extends JPanel implements ListSelectionListener, ActionListener {
 	private static final long serialVersionUID = 1L;
-	protected JList<String> list;
+	public JList<String> list;
 	protected DefaultListModel<String> listModel;
 	protected SortedListModel listModel2;
 	protected JScrollPane scrollPane;
-	protected final JLabel header;
+	protected final Style.TitleButton header;
 	BaseList(String title){
 		super(new VerticalFlowLayout());
@@ -37,7 +39,7 @@ public abstract class BaseList extends JPanel implements ListSelectionListener,
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		list.addListSelectionListener(this);
 		UIUtils.setDecorateSelection(list, false);
-		header = new Style.TitleLabel(title);
+		header = new Style.TitleButton(title, this);
 		add(header);
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
@@ -54,7 +56,7 @@ public abstract class BaseList extends JPanel implements ListSelectionListener,
 		list = new JList<String>(listModel);
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		list.addListSelectionListener(this);
-		header = new Style.TitleLabel(title);
+		header = new Style.TitleButton(title, this);
 		add(header);
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
@@ -70,7 +72,7 @@ public abstract class BaseList extends JPanel implements ListSelectionListener,
 		list = new JList<String>(items);
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		list.addListSelectionListener(this);
-		header = new Style.TitleLabel(title);
+		header = new Style.TitleButton(title, this);
 		add(header);
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
@@ -88,7 +90,7 @@ public abstract class BaseList extends JPanel implements ListSelectionListener,
 		list = new JList<String>(listModel2);
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		list.addListSelectionListener(this);
-		header = new Style.TitleLabel(title);
+		header = new Style.TitleButton(title, this);
 		add(header);
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
@@ -120,7 +122,7 @@ public abstract class BaseList extends JPanel implements ListSelectionListener,
 	@Override
 	public void actionPerformed(ActionEvent arg0) {
-		scrollPane.setVisible(!scrollPane.isVisible());
+		setVisible(false);
 		validate();
 		repaint();
 	}

{Panel → src/gdxstudio/panel}/BaseTable.java RENAMED Viewed

@@ -1,3 +1,6 @@
+package gdxstudio.panel;
+import gdxstudio.Style;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -28,6 +31,8 @@ import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -58,7 +63,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 	            return false;
 			}
 	};
-	protected final JTable table = new JTable(tableModel){
+	public final JTable table = new JTable(tableModel){
 		private static final long serialVersionUID = 1L;
 		public TableCellEditor getCellEditor(int row, int column)
@@ -184,6 +189,29 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		repaint();
 	}
+	public SpinnerIntegerEditor createIntegerSpinner(final String key){
+		final SpinnerIntegerEditor editor = new SpinnerIntegerEditor();
+		editor.spinner.addChangeListener(new ChangeListener(){
+			@Override
+			public void stateChanged(ChangeEvent arg0) {
+				setProperty(key, editor.spinner.getValue().toString());
+			}
+        });
+		return editor;
+	}
+	public SpinnerFloatEditor createFloatSpinner(final String key){
+		final SpinnerFloatEditor editor = new SpinnerFloatEditor();
+		editor.spinner.addChangeListener(new ChangeListener(){
+			@Override
+			public void stateChanged(ChangeEvent arg0) {
+				setProperty(key, editor.spinner.getValue().toString());
+			}
+        });
+		return editor;
+	}
 	public static JSpinner createSpinnerInteger(){
 		JSpinner spinner = new JSpinner(new SpinnerNumberModel(new Integer(0), new Integer(-99999),
 				new Integer(99999), new Integer(1)));
@@ -251,12 +279,12 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 	}
 	public static DefaultCellEditor createBooleanEditor(){
-		return new DefaultCellEditor(new JComboBox<String>(new String[]{"false", "true"}));
+		return new DefaultCellEditor(createComboBox("false", "true"));
 	}
 	public static DefaultCellEditor createTouchableEditor(){
-		return new DefaultCellEditor(new JComboBox<String>(new String[]{Touchable.enabled.toString()
+		return new DefaultCellEditor(createComboBox(Touchable.enabled.toString()
-				, Touchable.disabled.toString(), Touchable.childrenOnly.toString()}));
+				, Touchable.disabled.toString(), Touchable.childrenOnly.toString()));
 	}
 	public static TableCellEditor createCheckBoxEditor(){
@@ -507,7 +535,8 @@ class SpinnerIntegerEditor extends AbstractCellEditor implements TableCellEditor
     // Prepares the spinner component and returns it.
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected,
     		int row, int column) {
-        spinner.setValue((Integer)Integer.parseInt(value.toString()));
+    	float f = (Float) Float.parseFloat(value.toString());
+        spinner.setValue((int) f);
         return spinner;
     }

{Panel → src/gdxstudio/panel}/ConsolePanel.java RENAMED Viewed

@@ -1,3 +1,10 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.GdxStudio;
+import gdxstudio.StatusBar;
+import gdxstudio.Style;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -20,6 +27,8 @@ import javax.swing.SwingUtilities;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -42,7 +51,7 @@ public class ConsolePanel extends JPanel implements ActionListener {
 		UIUtils.setFontName(consoleArea, Content.editor.getFont().getFontName());
 		UIUtils.setMargin(this, new Insets(0,0,0,0));
 	    UIUtils.setUndecorated(this, true);
-        consoleAreaPane.setPreferredSize(new Dimension(500, 250));
+        consoleAreaPane.setPreferredSize(new Dimension(500, 200));
 		add(new Style.TitleButton("Console", this));
 		setVisible(false);
         add(consoleAreaPane);
@@ -52,7 +61,7 @@ public class ConsolePanel extends JPanel implements ActionListener {
 	public static void updateCompiler(){
 		String filename = ConsolePanel.class.getProtectionDomain().getCodeSource().getLocation().getFile();
-		Main.log(filename);
+		GdxStudio.log(filename);
 		if(filename.endsWith(".jar"))
 			classPath = filename;
 		else
@@ -125,15 +134,15 @@ public class ConsolePanel extends JPanel implements ActionListener {
 		public void write(byte[] b, int off, int len) throws IOException {
 			errString = new String(b, off, len);
 			consoleArea.setText("");
-			Main.log(errString);
+			GdxStudio.log(errString);
 			for(String line: errString.split(System.lineSeparator())){
-				if(line.contains(Content.getSceneFile()) && line.contains("warning")){
+				if(line.contains("warning")){
 					String[] warningLine = line.split(":");
 					warningCount++;
 					Content.editor.addWarning(Integer.parseInt(warningLine[warningLine.length-3]),
 							warningLine[warningLine.length-1]);
 				}
-				if(line.contains(Content.getSceneFile()) && line.contains("error")){
+				if(line.contains("error")){
 					String[] errorLine = line.split(":");
 					errorCount++;
 					Content.editor.addError(Integer.parseInt(errorLine[errorLine.length-3]),
@@ -164,7 +173,8 @@ public class ConsolePanel extends JPanel implements ActionListener {
 		}
 	});
-	public static void compile() {
+	public static void compile(final String file) {
+		clear();
 		Content.editor.clearIcons();
 		StatusBar.error.setForeground(Color.black);
 		StatusBar.error.setText("Errors");
@@ -172,7 +182,27 @@ public class ConsolePanel extends JPanel implements ActionListener {
 		StatusBar.warning.setText("Warnings");
 		errorCount = 0;
 		warningCount = 0;
+		consoleArea.append("Compiling... "+file+".java"+System.lineSeparator());
-		final String buildArgs = Content.getProject()+"source/"+ Content.getSceneFile()+".java"
+		final String buildArgs = Content.getProject()+"source/"+ file+".java"
+				+" -cp "+classPath
+				+" -d "+Content.getProject()+"bin"
+				+" -1.7"
+				+" -Xemacs";
+		Thread t = new Thread(new Runnable(){
+			@Override
+			public void run() {
+				BatchCompiler.compile(buildArgs, compilerWriter, compilerWriter, prog);
+				consoleArea.append("Finished Compiling... "+file+".java"+System.lineSeparator());
+				System.gc();
+			}
+		});
+		t.start();
+	}
+	public static void build() {
+		clear();
+		consoleArea.append("Building.. "+Content.getProject()+System.lineSeparator());
+		final String buildArgs = Content.getProject()+"source/"
 				+" -cp "+classPath
 				+" -d "+Content.getProject()+"bin"
 				+" -1.7"
@@ -181,6 +211,7 @@ public class ConsolePanel extends JPanel implements ActionListener {
 			@Override
 			public void run() {
 				BatchCompiler.compile(buildArgs, compilerWriter, compilerWriter, prog);
+				System.gc();
 			}
 		});
 		t.start();

src/gdxstudio/panel/DPanel.java ADDED Viewed

@@ -0,0 +1,30 @@
+package gdxstudio.panel;
+import java.io.File;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import scene2d.Asset;
+public class DPanel extends JTree {
+	private static final long serialVersionUID = 1L;
+	DefaultTreeModel treeModel;
+	DefaultMutableTreeNode root;
+	DefaultMutableTreeNode atlas;
+	DefaultMutableTreeNode font;
+	DefaultMutableTreeNode music;
+	DefaultMutableTreeNode sound;
+	DefaultMutableTreeNode model;
+	DefaultMutableTreeNode skin;
+	DPanel() {
+		root = new DefaultMutableTreeNode();
+		treeModel = new DefaultTreeModel(root);
+		for(File file: new File(Asset.basePath+"font").listFiles())
+			root.add(new DefaultMutableTreeNode(file.getName()));
+	}
+}

{Panel → src/gdxstudio/panel}/DashPanel.java RENAMED Viewed

@@ -1,6 +1,14 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Icon;
+import gdxstudio.SceneEditor;
+import gdxstudio.Style;
 import java.awt.AWTException;
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Robot;
 import java.awt.image.BufferedImage;
@@ -25,8 +33,10 @@ public class DashPanel extends JPanel {
 	public DashPanel(){
 		super(new VerticalFlowLayout());
+		UIUtils.setUndecorated(this, true);
 		UIUtils.setShadeWidth(this, 0);
 		UIUtils.setRound(this, 0);
+		UIUtils.setDrawSides(this, false, false, false, false);
 		setBackground(Color.black);
 		add(new Style.TitleButton("DashBoard", null));
 		label = new JLabel();
@@ -50,7 +60,7 @@ public class DashPanel extends JPanel {
 	}
 	public void update(){
-		screenRect.x = 210+(int)SceneEditor.selectedActor.getX();
+		screenRect.x = Content.studioPanel.getLocationOnScreen().x+(int)SceneEditor.selectedActor.getX();
 		screenRect.y = Gdx.graphics.getHeight()-(int)SceneEditor.selectedActor.getY()-15;
 		screenRect.width = (int)SceneEditor.selectedActor.getWidth();
 		screenRect.height = (int)SceneEditor.selectedActor.getHeight();
@@ -62,7 +72,7 @@ public class DashPanel extends JPanel {
 			screenRect.y -= (100 - DashPanel.screenRect.height)/4;
 			screenRect.height = 100;
 		}
-		setIcon(DashPanel.robot.createScreenCapture(screenRect));
+		setIcon(robot.createScreenCapture(screenRect).getScaledInstance(200, 100, Image.SCALE_DEFAULT));
 	}
 	public void setIcon(String iconname){
@@ -73,6 +83,10 @@ public class DashPanel extends JPanel {
 		label.setIcon(new ImageIcon(image));
 	}
+	public void setIcon(Image image){
+		label.setIcon(new ImageIcon(image));
+	}
 	public void setTextureRegion(String texName){
 	}
 }

{Panel → src/gdxstudio/panel}/EffectPanel.java RENAMED Viewed

@@ -1,6 +1,14 @@
+package gdxstudio.panel;
+import gdxstudio.SceneEditor;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
+import scene2d.Effect;
+import scene2d.EffectType;
+import scene2d.ImageJson;
+import scene2d.InterpolationType;
+import scene2d.Scene;
 import web.laf.lite.utils.UIUtils;
@@ -67,7 +75,7 @@ public class EffectPanel extends BaseTable {
 				case "Interpolation":img.interpolationType = InterpolationType.valueOf(value);break;
 			}
 			Effect.createEffect(img);
-			SceneEditor.isDirty = true;
+			Scene.isDirty = true;
 		}
 	}
 }

{Panel → src/gdxstudio/panel}/EventPanel.java RENAMED Viewed

@@ -1,6 +1,13 @@
+package gdxstudio.panel;
+import gdxstudio.SceneEditor;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
+import scene2d.EventType;
+import scene2d.ImageJson;
+import scene2d.Scene;
 public class EventPanel extends BaseTable {
 	private static final long serialVersionUID = 1L;
@@ -15,7 +22,7 @@ public class EventPanel extends BaseTable {
 		editors.add(new DefaultCellEditor(sceneComboBox));
 		for(EventType event: EventType.values())
 			eventComboBox.addItem(event.toString());
-		for(OnEventType onEvent: OnEventType.values())
+		for(Scene.OnEventType onEvent: Scene.OnEventType.values())
 			 onEventComboBox.addItem(onEvent.toString());
 		for(String scene: Scene.scenesMap.keys())
 			 sceneComboBox.addItem(scene);
@@ -54,7 +61,7 @@ public class EventPanel extends BaseTable {
 						onEventComboBox.setEnabled(false);
 					}
 					else if(img.evtType == EventType.SceneCreated){
-						onEventComboBox.setSelectedItem(OnEventType.DoEffect.toString());
+						onEventComboBox.setSelectedItem(Scene.OnEventType.DoEffect.toString());
 						onEventComboBox.setEnabled(false);
 					}
 					else{
@@ -63,8 +70,8 @@ public class EventPanel extends BaseTable {
 					break;
 				case "onEvent":
-					img.onEvtType = OnEventType.valueOf(value);
+					img.onEvtType = Scene.OnEventType.valueOf(value);
-					if(img.onEvtType == OnEventType.DoEffect){
+					if(img.onEvtType == Scene.OnEventType.DoEffect){
 						sceneComboBox.setEnabled(false);
 					}
 					else{
@@ -73,7 +80,7 @@ public class EventPanel extends BaseTable {
 					break;
 				case "Scene": img.eventScene = value;break;
 			}
-			SceneEditor.isDirty = true;
+			Scene.isDirty = true;
 		}
 	}
 }

src/gdxstudio/panel/MapPanel.java ADDED Viewed

@@ -0,0 +1,16 @@
+package gdxstudio.panel;
+import javax.swing.event.ListSelectionEvent;
+public class MapPanel extends BaseList {
+	MapPanel() {
+		super("");
+	}
+	private static final long serialVersionUID = 1L;
+	@Override
+	public void valueChanged(ListSelectionEvent arg0) {
+	}
+}

{Panel → src/gdxstudio/panel}/OptionsPanel.java RENAMED Viewed

@@ -1,19 +1,22 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Editor;
+import gdxstudio.Frame;
+import gdxstudio.Icon;
+import gdxstudio.Style;
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 import javax.swing.BorderFactory;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JToggleButton;
 import javax.swing.SpringLayout;
-import com.badlogic.gdx.tools.imagepacker.TexturePacker2;
+import javax.swing.SwingConstants;
-import com.badlogic.gdx.tools.imagepacker.TexturePacker2.Settings;
 import web.laf.lite.layout.HorizontalFlowLayout;
 import web.laf.lite.layout.ToolbarLayout;
@@ -21,6 +24,8 @@ import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.popup.AlignPanel;
 import web.laf.lite.utils.SpringUtils;
 import web.laf.lite.utils.UIUtils;
+import web.laf.lite.widget.Register;
+import web.laf.lite.widget.WebButtonGroup;
 import web.laf.lite.widget.WebSwitch;
 public class OptionsPanel extends JPanel implements ActionListener {
@@ -37,8 +42,6 @@ public class OptionsPanel extends JPanel implements ActionListener {
 	JPanel conten5Border = new JPanel(new VerticalFlowLayout());
 	JPanel content5 = new JPanel(new SpringLayout());
-	JButton packButton;
 	public OptionsPanel(){
 		super(new VerticalFlowLayout(0, 10));
@@ -160,28 +163,7 @@ public class OptionsPanel extends JPanel implements ActionListener {
     	SpringUtils.makeCompactGrid(content5, 6, 4, 10, 0, 10, 5);
     	conten5Border.add(content5);
     	add(conten5Border);
-    	packButton = new JButton("Pack All Textures");
-    	packButton.addActionListener(new ActionListener(){
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				Settings settings = new Settings();
-				settings.maxWidth = 2048;
-		        settings.maxHeight = 2048;
-		        settings.paddingX = 0;
-		        settings.paddingY = 0;
-				TexturePacker2.process(settings, Content.getProject()+File.separator+"pack",
-						Content.getProject()+"atlas/", "pack.atlas");
-				for(File f: new File(Content.getProject()+File.separator+"pack").listFiles()){
-					if(f.isDirectory()){
+        initStyle();
-						TexturePacker2.process(settings, f.getPath(), Content.getProject()+"atlas/", f.getName());
-						JOptionPane.showMessageDialog(null, "Packed Texture: "+f.getName(), "Texture Packer",
-								JOptionPane.INFORMATION_MESSAGE);
-					}
-				}
-			}
-    	});
-        add(packButton);
        // add(menuItem(tabSlider, "Tab Size"));
       //setMarginLineColor(Color.black);
         //setMarkOccurrences(true);
@@ -257,13 +239,60 @@ public class OptionsPanel extends JPanel implements ActionListener {
 	}
 	void createHeader(JPanel content, String title){
-		//content.setBackground(Color.white);
 		content.add(new Style.TitleLabel(title));
 		content.setBorder(BorderFactory.createLineBorder(Style.border));
 	}
+	void createHeader(JPanel content, String title, String icon){
+		content.add(new Style.TitleLabel(title, icon));
+		content.setBorder(BorderFactory.createLineBorder(Style.border));
+	}
+	void initStyle(){
+		JPanel vert = new JPanel(new VerticalFlowLayout());
+		createHeader(vert, "Styles");
+        ThemeButton[] themeButtons = {
+        		createThemeItem("IntelliJ IDEA", "idea"),
+        		createThemeItem("Dark", "dark"),
+        		createThemeItem("Visual Studio", "vs"),
+        		createThemeItem("Eclipse", "eclipse")
+        };
+        WebButtonGroup themeGroup = new WebButtonGroup(WebButtonGroup.HORIZONTAL, true, themeButtons);
+        themeGroup.setButtonsDrawFocus(false);
+        themeGroup.setButtonsDrawFocus(false);
+        vert.add(themeGroup);
+        add(vert);
+	}
+	ThemeButton createThemeItem(String title, String iconname){
+		final ThemeButton themeButton = new ThemeButton(title, iconname);
+		if(Register.getTheme().equals(iconname))
+			themeButton.setSelected(true);
+		themeButton .addActionListener (new ActionListener (){
+            public void actionPerformed (ActionEvent e){
+            	Register.setTheme(themeButton.iconame);
+            	Content.theme = Icon.loadTheme(themeButton.iconame);
+            	Content.theme.apply(Content.editor);
+           }
+        });
+		return themeButton;
+	}
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		setVisible(false);
 	}
 }
+final class ThemeButton extends JToggleButton{
+	private static final long serialVersionUID = 1L;
+	String iconame;
+	ThemeButton(String text, String ic){
+		super(text, Icon.icon(ic));
+		iconame = ic;
+		setVerticalTextPosition(SwingConstants.BOTTOM);
+        setHorizontalTextPosition(SwingConstants.CENTER);
+        setFocusable(false);
+	}
+}

{Panel → src/gdxstudio/panel}/ProjectPanel.java RENAMED Viewed

@@ -1,3 +1,9 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Frame;
+import gdxstudio.Icon;
+import gdxstudio.Style;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -23,9 +29,6 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
-import com.badlogic.gdx.utils.JsonReader;
-import com.badlogic.gdx.utils.JsonValue;
 import web.laf.lite.layout.HorizontalFlowLayout;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -183,102 +186,4 @@ public class ProjectPanel extends JPanel implements ActionListener, TableModelLi
 	public void actionPerformed(ActionEvent e) {
 		propTable.setVisible(!propTable.isVisible());
 	}
-}
-class ProjectSettingsPanel extends BaseTable {
-	private static final long serialVersionUID = 1L;
-	String[] screenSizes = {
-			"320x240", "480x320", "800x480", "852x480", "960x540", "1280x720", "1980x1080", "860x650"
-	};
-	String[] targetSizes = {
-			"800x480"
-	};
-	JComboBox<String> screenCombo = createComboBox(screenSizes);
-	JComboBox<String> targetCombo = createComboBox(targetSizes);
-	ProjectSettingsPanel(){
-		super("Settings");
-		editors.add(createTextFieldEditor());
-		editors.add(new DefaultCellEditor(targetCombo));
-		editors.add(new DefaultCellEditor(screenCombo));
-		editors.add(createNumberField());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		editors.add(createCheckBoxEditor());
-		if(Content.projectExists())
-			update();
-	}
-	@Override
-	public void clear(String... items){
-		super.clear("", "" ,"" ,"" ,"", "", "", "", "", "", "", "", "");
-	}
-	private static JsonValue jsonValue;
-	JsonReader jsonReader = new JsonReader();
-	@Override
-	public void update(String... items){
-		super.update();
-    	String text = Export.readFile("config");
-    	if(text.isEmpty())
-    		return;
-    	jsonValue = jsonReader.parse(text);
-    	addRow("Title", jsonValue.getString("title"));
-    	addRow("TargetSize", jsonValue.getString("targetSize"));
-    	addRow("ScreenSize", jsonValue.getString("screenSize"));
-    	addRow("AudioBufferCount", jsonValue.getString("audioBufferCount"));
-    	addRow("Resize", jsonValue.getBoolean("resize"));
-    	addRow("ForceExit", jsonValue.getBoolean("forceExit"));
-    	addRow("FullScreen", jsonValue.getBoolean("fullScreen"));
-    	addRow("UseGL20", jsonValue.getBoolean("useGL20"));
-    	addRow("VSync", jsonValue.getBoolean("vSync"));
-    	addRow("DisableAudio", jsonValue.getBoolean("disableAudio"));
-    	addRow("KeepAspectRatio", jsonValue.getBoolean("keepAspectRatio"));
-    	addRow("ShowFPS", jsonValue.getBoolean("showFPS"));
-    	addRow("LoggingEnabled", jsonValue.getBoolean("loggingEnabled"));
-    	ProjectPanel.updateProperty("Version", jsonValue.getString("version"));
-    	ProjectPanel.updateProperty("Target", jsonValue.getString("target"));
-    	/*createRow(content3, "Use Accelerometer", new WebSwitch());
-    	createRow(content3, "Use Compass", new WebSwitch());
-    	createRow(content3, "Use WakeLock", new WebSwitch());
-    	createRow(content3, "Hide Status Bar", new WebSwitch());*/
-	}
-	@Override
-	public void setProperty(String key, String value) {
-		if(key.isEmpty() && value.isEmpty()){
-			return;
-		}
-		jsonValue.get("hasIcon").set(new File(Content.getProject()+"icon.png").exists());
-		jsonValue.get(Stage.uncapitalize(key)).set(value);
-		Export.writeFile("config", jsonValue.toString());
-	}
-	public void updateVersion(String version){
-		jsonValue.get("version").set(version);
-		Export.writeFile("config", jsonValue.toString());
-	}
-	public void updateTarget(String target){
-		jsonValue.get("target").set(target);
-		Export.writeFile("config", jsonValue.toString());
-	}
-	static String jsonizeArray(Object[] array){
-		StringBuilder sb = new StringBuilder();
-		for(Object s: array){
-			sb.append(s.toString().trim());
-			sb.append(",");
-		}
-		sb.deleteCharAt(sb.lastIndexOf(","));
-		return sb.toString();
-	}
 }

src/gdxstudio/panel/ProjectSettingsPanel.java ADDED Viewed

@@ -0,0 +1,121 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Export;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import scene2d.Scene;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+public class ProjectSettingsPanel extends BaseTable {
+	private static final long serialVersionUID = 1L;
+	String[] screenSizes = {
+			"320x240", "480x320", "800x480", "852x480", "960x540", "1280x720", "1980x1080"
+	};
+	String[] targetSizes = {
+			"800x480"
+	};
+	JComboBox<String> screenCombo = createComboBox(screenSizes);
+	JComboBox<String> targetCombo = createComboBox(targetSizes);
+	public ProjectSettingsPanel(){
+		super("Settings");
+		editors.add(createTextFieldEditor());
+		editors.add(new DefaultCellEditor(targetCombo));
+		editors.add(new DefaultCellEditor(screenCombo));
+		editors.add(createNumberField());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		editors.add(createCheckBoxEditor());
+		if(Content.projectExists())
+			update();
+		screenCombo.addItemListener(new ItemListener(){
+			@Override
+			public void itemStateChanged(ItemEvent e) {
+				//String val[] = screenCombo.getSelectedItem().toString().split("x");
+				//Content.studioPanel.setGdxScreenSize(Integer.parseInt(val[0]), Integer.parseInt(val[1]));
+			}
+		});
+	}
+	@Override
+	public void clear(String... items){
+		super.clear("", "" ,"" ,"" ,"", "", "", "", "", "", "", "", "");
+	}
+	private static JsonValue jsonValue;
+	JsonReader jsonReader = new JsonReader();
+	@Override
+	public void update(String... items){
+		super.update();
+    	String text = Export.readFile("config");
+    	if(text.isEmpty())
+    		return;
+    	jsonValue = jsonReader.parse(text);
+    	addRow("Title", jsonValue.getString("title"));
+    	addRow("TargetSize", jsonValue.getString("targetSize"));
+    	addRow("ScreenSize", jsonValue.getString("screenSize"));
+    	addRow("AudioBufferCount", jsonValue.getString("audioBufferCount"));
+    	addRow("Resize", jsonValue.getBoolean("resize"));
+    	addRow("ForceExit", jsonValue.getBoolean("forceExit"));
+    	addRow("FullScreen", jsonValue.getBoolean("fullScreen"));
+    	addRow("UseGL20", jsonValue.getBoolean("useGL20"));
+    	addRow("VSync", jsonValue.getBoolean("vSync"));
+    	addRow("DisableAudio", jsonValue.getBoolean("disableAudio"));
+    	addRow("KeepAspectRatio", jsonValue.getBoolean("keepAspectRatio"));
+    	addRow("ShowFPS", jsonValue.getBoolean("showFPS"));
+    	addRow("LoggingEnabled", jsonValue.getBoolean("loggingEnabled"));
+    	ProjectPanel.updateProperty("Version", jsonValue.getString("version"));
+    	ProjectPanel.updateProperty("Target", jsonValue.getString("target"));
+    	/*createRow(content3, "Use Accelerometer", new WebSwitch());
+    	createRow(content3, "Use Compass", new WebSwitch());
+    	createRow(content3, "Use WakeLock", new WebSwitch());
+    	createRow(content3, "Hide Status Bar", new WebSwitch());*/
+	}
+	@Override
+	public void setProperty(String key, String value) {
+		if(key.isEmpty() && value.isEmpty()){
+			return;
+		}
+		jsonValue.get("hasIcon").set(new File(Content.getProject()+"icon.png").exists());
+		jsonValue.get(Scene.uncapitalize(key)).set(value);
+		Export.writeFile("config", jsonValue.toString());
+	}
+	public void updateVersion(String version){
+		jsonValue.get("version").set(version);
+		Export.writeFile("config", jsonValue.toString());
+	}
+	public void updateTarget(String target){
+		jsonValue.get("target").set(target);
+		Export.writeFile("config", jsonValue.toString());
+	}
+	static String jsonizeArray(Object[] array){
+		StringBuilder sb = new StringBuilder();
+		for(Object s: array){
+			sb.append(s.toString().trim());
+			sb.append(",");
+		}
+		sb.deleteCharAt(sb.lastIndexOf(","));
+		return sb.toString();
+	}
+}

{Panel → src/gdxstudio/panel}/PropertyPanel.java RENAMED Viewed

@@ -1,3 +1,7 @@
+package gdxstudio.panel;
+import gdxstudio.Frame;
+import gdxstudio.SceneEditor;
 import java.awt.Component;
 import java.awt.Insets;
@@ -6,9 +10,12 @@ import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
 import javax.swing.JTable;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import scene2d.Asset;
+import scene2d.ImageJson;
+import scene2d.Scene;
+import scene2d.Serializer;
+import scene2d.Sprite;
 import web.laf.lite.layout.ToolbarLayout;
 import web.laf.lite.utils.UIUtils;
@@ -52,17 +59,6 @@ public class PropertyPanel extends BaseTable {
 		editors.add(createTextFieldEditor());
 	}
-	public SpinnerIntegerEditor createIntegerSpinner(final String key){
-		final SpinnerIntegerEditor editor = new SpinnerIntegerEditor();
-		editor.spinner.addChangeListener(new ChangeListener(){
-			@Override
-			public void stateChanged(ChangeEvent arg0) {
-				setProperty(key, editor.spinner.getValue().toString());
-			}
-        });
-		return editor;
-	}
 	@Override
 	public void clear(String... names){
 		super.clear("Name", "X", "Y", "Width", "Height",  "OriginX", "OriginY", "Rotation", "Z-Index", "Color", "Touchable", "Visible", "", "", "", "");
@@ -71,11 +67,11 @@ public class PropertyPanel extends BaseTable {
 	@Override
 	public void update(String... names){
 		rowCount = 0;
-		super.update("Name", ""+SceneEditor.selectedActor.getName(), "X", ""+(int)SceneEditor.selectedActor.getX(),
+		super.update("Name", ""+SceneEditor.selectedActor.getName(), "X", ""+SceneEditor.selectedActor.getX(),
-				"Y", ""+(int)SceneEditor.selectedActor.getY(), "Width", ""+(int)SceneEditor.selectedActor.getWidth(),
+				"Y", ""+SceneEditor.selectedActor.getY(), "Width", ""+SceneEditor.selectedActor.getWidth(),
-				"Height", ""+(int)SceneEditor.selectedActor.getHeight(), "OriginX",""+(int)SceneEditor.selectedActor.getOriginX(),
+				"Height", ""+SceneEditor.selectedActor.getHeight(), "OriginX",""+SceneEditor.selectedActor.getOriginX(),
-				"OriginY",""+(int)SceneEditor.selectedActor.getOriginY(),"Rotation",""+(int)SceneEditor.selectedActor.getRotation(),
+				"OriginY",""+SceneEditor.selectedActor.getOriginY(),"Rotation",""+SceneEditor.selectedActor.getRotation(),
-				"Z-Index", ""+(int)SceneEditor.selectedActor.getZIndex(),
+				"Z-Index", ""+SceneEditor.selectedActor.getZIndex(),
 				"Color", ""+SceneEditor.selectedActor.getColor().toString(),
 				"Touchable", ""+SceneEditor.selectedActor.getTouchable().toString(),
 				"Visible", ""+SceneEditor.selectedActor.isVisible()
@@ -159,7 +155,7 @@ public class PropertyPanel extends BaseTable {
 			return ;
 		switch(key){
 			case "Name":
-				for(Actor actor: Stage.getChildren())
+				for(Actor actor: Scene.getCurrentScene().getChildren())
 					if(actor != null)
 						if(actor.getName() != null)
 							if(actor.getName().equals(value)){
@@ -179,10 +175,10 @@ public class PropertyPanel extends BaseTable {
 			case "Rotation": SceneEditor.selectedActor.setRotation(Float.parseFloat(value));break;
 			case "Z-Index":
 				int z = Integer.parseInt(value);
-				if(!(z<0) && !(z>Stage.getRoot().getChildren().size))
+				if(z>0 && z<Scene.getCurrentScene().getChildren().size){
 					SceneEditor.selectedActor.setZIndex(z);
-				else
+				}
-					updateProperty("Z-Index", ""+SceneEditor.selectedActor.getZIndex(), 0);
+				//updateProperty("Z-Index", ""+SceneEditor.selectedActor.getZIndex(), 0);
 				break;
 			case "Color":
 				if(value.length() == 8 && value.matches("[0-9A-Fa-f]+"))
@@ -250,8 +246,8 @@ public class PropertyPanel extends BaseTable {
 				else
 					newimg.setZIndex(img.getZIndex());
 				newimg.setColor(img.getColor());
-				Stage.removeActor(img);
+				Scene.getCurrentScene().removeActor(img);
-				Stage.addActor(newimg);
+				Scene.getCurrentScene().addActor(newimg);
 				newimg.pack();
 				SceneEditor.selectedActor = newimg;
 				break;
@@ -279,8 +275,8 @@ public class PropertyPanel extends BaseTable {
 				((Sprite)SceneEditor.selectedActor).isAnimationLooping = Boolean.parseBoolean(value);
 				break;
 		}
-		SceneEditor.isDirty = true;
+		Scene.isDirty = true;
-		Stage.outline(SceneEditor.selectedActor);
+		Scene.getCurrentScene().outline(SceneEditor.selectedActor);
 		Frame.dashPanel.update();
 	}
@@ -311,7 +307,7 @@ class PropertyRenderer extends BaseRenderer {
     	    return checkBox;
     	}*/
 		//try {
-	        Boolean.parseBoolean(value.toString());
+	       // Boolean.parseBoolean(value.toString());
 	   // } catch ( java.text.ParseException e ) {
 	  //  	e.printStackTrace();
 	  //  }

{Panel → src/gdxstudio/panel}/ReplacePanel.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.panel;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;

{Panel → src/gdxstudio/panel}/SceneEffectPanel.java RENAMED Viewed

@@ -1,35 +1,33 @@
+package gdxstudio.panel;
+import java.awt.Component;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
+import javax.swing.JTable;
+import scene2d.Asset;
+import scene2d.Effect;
+import scene2d.EffectType;
+import scene2d.InterpolationType;
+import scene2d.Scene;
 public class SceneEffectPanel extends BaseTable {
 	private static final long serialVersionUID = 1L;
-	static String[] durations =
-	{
-		"0.0", "0.1", "0.2", "0.3", "0.4", "0.5", "0.6", "0.7", "0.8", "0.9",
-		"1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9",
-		"2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9",
-		"3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9",
-		"4.0", "4.1", "4.2", "4.3", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9",
-		"5.0"
-	};
 	static JComboBox<String> bgComboBox = createComboBox();
 	static JComboBox<String> musicComboBox = createComboBox();
 	static JComboBox<String> transitionComboBox = createComboBox();
-	static JComboBox<String> durationComboBox = createComboBox(durations);
 	static JComboBox<String> interpolationComboBox = createComboBox();
 	public SceneEffectPanel(){
-		super("Properties");
+		super("Properties", null, new SceneEffectRenderer());
 		editors.add(new DefaultCellEditor(bgComboBox));
 		editors.add(new DefaultCellEditor(musicComboBox));
 		editors.add(new DefaultCellEditor(transitionComboBox));
-		editors.add(new DefaultCellEditor(durationComboBox));
+		editors.add(createFloatSpinner("Duration"));
 		editors.add(new DefaultCellEditor(interpolationComboBox));
-		for(TransitionType transition: TransitionType.values())
+		for(EffectType effect: EffectType.values())
-			transitionComboBox.addItem(transition.toString());
+			transitionComboBox.addItem(effect.toString());
 		for(InterpolationType interpolation: InterpolationType.values())
 			interpolationComboBox.addItem(interpolation.toString());
 	}
@@ -41,9 +39,7 @@ public class SceneEffectPanel extends BaseTable {
 	@Override
 	public void update(String... values){
-		if(Stage.getScene() == null)
-			return;
-		Scene scene = Stage.getScene();
+		Scene scene = Scene.getCurrentScene();
 		super.update("Background", scene.sceneBackground, "Music", scene.sceneMusic,
 				"Transition", scene.sceneTransition, "Duration", ""+scene.sceneDuration,
 				"Interpolation", scene.sceneInterpolationType.toString());
@@ -61,16 +57,14 @@ public class SceneEffectPanel extends BaseTable {
 	public void setProperty(String key, String value){
 		if(key.isEmpty() || value.isEmpty())
 			return ;
-		if(Stage.getScene() == null)
-			return;
-		Scene scene = Stage.getScene();
+		Scene scene = Scene.getCurrentScene();
 		switch(key){
 			case "Background":
 				scene.sceneBackground = value;
 				if(!scene.sceneBackground.equals("None"))
-					Stage.setBackground(scene.sceneBackground);
+					Scene.getCurrentScene().setBackground(scene.sceneBackground);
 				else
-					Stage.removeBackground();
+					Scene.getCurrentScene().removeBackground();
 				break;
 			case "Music":
 				scene.sceneMusic = value;
@@ -79,20 +73,37 @@ public class SceneEffectPanel extends BaseTable {
 				break;
 			case "Transition":
 				scene.sceneTransition = value;
-				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
-						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
 				break;
 			case "Duration":
 				scene.sceneDuration = Float.parseFloat(value);
-				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
-						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
 				break;
 			case "Interpolation":
 				scene.sceneInterpolationType = InterpolationType.valueOf(value);
-				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
-						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
 				break;
 		}
+		Effect.createEffect(Scene.getRoot(), EffectType.valueOf(scene.sceneTransition), 1f,
+				scene.sceneDuration, scene.sceneInterpolationType);
-		SceneEditor.isDirty = true;
+		Scene.isDirty = true;
 	}
+}
+class SceneEffectRenderer extends BaseRenderer {
+	private static final long serialVersionUID = 1L;
+	@Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+        setBorder(noFocusBorder);
+        if(column == 0)
+        	return new HeaderLabel(value.toString());
+        else {
+        	if(row == 3){
+        		if(!value.toString().isEmpty())
+        			spinnerFloat.setValue(Float.parseFloat(value.toString()));
+        		else
+        			spinnerFloat.setValue(new Float(0.0));
+        		return spinnerFloat;
+            }
+        }
+        return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+    }
 }

src/gdxstudio/panel/ScenePanel.java ADDED Viewed

@@ -0,0 +1,274 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Export;
+import gdxstudio.Frame;
+import gdxstudio.SceneEditor;
+import gdxstudio.Style;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.Timer;
+import javax.swing.event.ListSelectionEvent;
+import scene2d.Camera;
+import scene2d.Scene;
+import scene2d.Serializer;
+import web.laf.lite.widget.CenterPanel;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.EventListener;
+final public class ScenePanel extends BaseList {
+	private static final long serialVersionUID = 1L;
+	public static JComboBox<String> stateComboBox = BaseTable.createComboBox("Scenes", "Maps", "Actors",
+			"Assets");
+	private static JButton addscene, updown ,delete, resume, pause;
+	private final Timer saveTimer = new Timer(20000, new ActionListener(){
+		@Override
+		public void actionPerformed(ActionEvent arg0) {
+			Scene.getCurrentScene().save(getSelectedValue());
+		}
+	});
+	private static File classPath;
+	public ScenePanel(){
+		super("Scenes", true);
+		saveTimer.start();
+		Serializer.registerSerializer(SceneEditor.class, new Serializer.SceneSerializer());
+		initToolBar();
+		add(scrollPane);
+		stateComboBox.addItemListener(new ItemListener(){
+			@Override
+			public void itemStateChanged(ItemEvent e) {
+				clear();
+				switch(stateComboBox.getSelectedIndex()){
+					case 0: header.setText("SCENES");break;
+					case 1: header.setText("MAPS");break;
+					case 2: header.setText("ACTORS");break;
+				}
+				update();
+			}
+	    });
+	}
+	void initToolBar(){
+		JPanel tools = Style.createButtonToolBarPanel();
+		addscene = Style.createToolButton("New Scene", "newfile", this);
+		updown = Style.createToolButton("ScenePriority", "updown", this);
+		delete = Style.createToolButton("Delete", "trash", this);
+		resume = Style.createToolButton("Resume", "resume", this);
+		pause = Style.createToolButton("Pause", "pause", this);
+		pause.setEnabled(false);
+		tools.add(addscene);
+		tools.add(updown);
+		tools.add(delete);
+		tools.add(resume);
+		tools.add(pause);
+		stateComboBox.setPreferredSize(new Dimension(65, 17));
+		tools.add(new CenterPanel(stateComboBox, false, true));
+		add(tools);
+	}
+	public void update(){
+		lock();
+		listModel.clear();
+		for(String s: Scene.scenesMap.keys())
+			listModel.addElement(s.replace(Scene.basePackage, ""));
+		if(listModel.getSize()>0 && listModel.get(0) != null || !listModel.get(0).isEmpty())
+			list.setSelectedIndex(0);
+		Frame.eventPanel.update();
+		classPath = new File(Content.getProject()+"bin/");
+		unlock();
+	}
+	private void createSceneFile(){
+		String text = JOptionPane.showInputDialog(Frame.getInstance(), "Create a New Scene", "New Scene",
+				JOptionPane.OK_CANCEL_OPTION);
+		if(text == null || text.isEmpty())
+			return;
+		String name = text.replace(".json", "").replace(".java", "");
+		name = Scene.capitalize(name);
+		if(listModel.contains(name)){
+			JOptionPane.showConfirmDialog(null, "Error: File already exists: "+name, "Error",
+					JOptionPane.OK_OPTION);
+			return;
+		}
+		else{
+			Export.writeFile("source/"+name+".java",
+					Export.readFileFromClassPath("SceneTemplate.txt").replace("$$$", name));
+			listModel.addElement(name);
+			Scene.scenesMap.put(name, "");
+			Frame.eventPanel.update();
+		}
+		list.setSelectedIndex(listModel.indexOf(name));
+		Scene.isDirty = true;
+		Scene.getCurrentScene().save(getSelectedValue());
+	}
+	@Override
+	public void actionPerformed(ActionEvent event) {
+		switch(((JButton)event.getSource()).getToolTipText()){
+			case "New Scene":
+				createSceneFile();
+				break;
+			case "ScenePriority":
+				int sceneindex = list.getSelectedIndex();
+				if(sceneindex+1 < listModel.size()){
+					lock();
+					String selected = listModel.getElementAt(sceneindex);
+					String selectedValue = Scene.scenesMap.getValueAt(sceneindex);
+					String down = listModel.getElementAt(sceneindex+1);
+					String downValue = Scene.scenesMap.getValueAt(sceneindex+1);
+					/* Changing the model of List */
+					listModel.setElementAt(selected, sceneindex+1);
+					listModel.setElementAt(down, sceneindex);
+					/* Changing the sceneMap of Stage */
+					Scene.scenesMap.setKey(sceneindex+1, selected);
+					Scene.scenesMap.setValue(sceneindex+1, selectedValue);
+					Scene.scenesMap.setKey(sceneindex, down);
+					Scene.scenesMap.setValue(sceneindex, downValue);
+					list.setSelectedIndex(sceneindex+1);
+					unlock();
+				}
+				break;
+			case "Delete":
+				int confirm = JOptionPane.showConfirmDialog(null,
+						"Are you Sure you want to delete the Scene?", "Delete Scene",
+						JOptionPane.YES_NO_OPTION);
+				if(confirm == JOptionPane.YES_OPTION){
+					lock();
+					Export.deleteFile("source/"+list.getSelectedValue()+".java");
+					Export.deleteFile("bin/"+list.getSelectedValue()+".class");
+					Scene.scenesMap.removeKey(list.getSelectedValue());
+					int index = listModel.indexOf(list.getSelectedValue())-1;
+					if(index != -1){
+						Content.editor.load();
+						if(Content.currentView.equals("Editor"))
+							Content.toggleView(1);
+					}
+					listModel.removeElement(list.getSelectedValue());
+					Frame.eventPanel.update();
+					list.setSelectedValue(listModel.elementAt(index), true);
+					showStudio();
+					Scene.isDirty = true;
+					Scene.getCurrentScene().save(getSelectedValue());
+					unlock();
+				}
+				break;
+			case "Resume":
+				Scene.getCurrentScene().save(getSelectedValue());
+				list.setEnabled(false);
+				addscene.setEnabled(false);
+				updown.setEnabled(false);
+				delete.setEnabled(false);
+				resume.setEnabled(false);
+				pause.setEnabled(true);
+				Frame.sceneEffectPanel.disable();
+				Frame.propertyPanel.disable();
+				Frame.effectPanel.disable();
+				Frame.eventPanel.disable();
+				Content.widgetPanel.disable();
+				Content.toggleView(2);
+				runGame();
+				break;
+			case "Pause":
+				Scene.cl = null;
+				Scene.debug = true;
+				list.setEnabled(true);
+				addscene.setEnabled(true);
+				updown.setEnabled(true);
+				delete.setEnabled(true);
+				resume.setEnabled(true);
+				pause.setEnabled(false);
+				Frame.sceneEffectPanel.enable();
+				Frame.propertyPanel.enable();
+				Frame.effectPanel.enable();
+				Frame.eventPanel.enable();
+				Content.widgetPanel.enable();
+				Scene.scenesMap.put("gdxstudio.SceneEditor", "");
+				Scene.setScene("gdxstudio.SceneEditor");
+				Content.toggleView(2);
+				showStudio();
+				break;
+		}
+	}
+	private String prevScene = "";
+	@Override
+	public void valueChanged(ListSelectionEvent e) {
+		if (e.getValueIsAdjusting() == false) {
+			ConsolePanel.clear();
+			Content.editor.clearIcons();
+			Content.editor.save();
+			Scene.getCurrentScene().save(prevScene);//Warning Only Change
+			if(list.getSelectedValue() == null)
+				return;
+			prevScene = list.getSelectedValue();
+			if(resume.isEnabled())
+				showStudio();
+			Content.editor.load();
+			Frame.actorPanel.setHeaderText(list.getSelectedValue());
+		}
+	}
+	public void showStudio(){
+		Frame.actorPanel.clear();
+		Scene.getRoot().clearChildren();
+		Scene.getCurrentScene().clear();
+		Camera.clearAllHud();
+		Camera.followActor(null);
+		Camera.reset();
+		if(selectedValueExists()){
+			Scene.getCurrentScene().load(getSelectedValue());
+			for(Actor child: Scene.getCurrentScene().getChildren()){
+				Frame.actorPanel.addActor(child.getName());
+				for(EventListener l: child.getListeners())
+					child.removeListener(l);
+			}
+			Scene.getRoot().addActor(Scene.getCurrentScene());
+		}
+		Frame.sceneEffectPanel.update();
+	}
+	public void runGame() {
+		try {
+			ConsolePanel.clear();
+			Frame.actorPanel.clear();
+			URL url = classPath.toURI().toURL();
+			URLClassLoader cl = URLClassLoader.newInstance(new URL[]{url});
+			Scene.cl = cl;
+			Scene.debug = false;
+			Scene.setScene(list.getSelectedValue());
+		} catch (MalformedURLException me) {
+			me.printStackTrace();
+		}
+	}
+	public boolean selectedValueExists(){
+		if(list.getSelectedValue() != null && !list.getSelectedValue().isEmpty())
+			return true;
+		return false;
+	}
+	public String getSelectedValue(){
+		return list.getSelectedValue();
+	}
+}

{Panel → src/gdxstudio/panel}/SceneTemplate.txt RENAMED Viewed

@@ -1,12 +1,23 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.Input.Keys;
+import scene2d.*;
+import scene3d.*;
 public class $$$ extends Scene {
 	public $$$(){
 	}
+	@Override
+	public void act(float delta){
+		super.act(delta);
+	}
 	@Override
 	public void onClick(Actor actor){

{Panel → src/gdxstudio/panel}/StudioPanel.java RENAMED Viewed

@@ -1,3 +1,11 @@
+package gdxstudio.panel;
+import gdxstudio.Content;
+import gdxstudio.Frame;
+import gdxstudio.GdxStudio;
+import gdxstudio.Style;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -8,18 +16,30 @@ import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetDropEvent;
 import java.io.File;
-import java.io.IOException;
 import java.nio.ByteBuffer;
-import javax.imageio.ImageIO;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.GLContext;
+import scene2d.Asset;
+import scene2d.Effect;
+import scene2d.EffectType;
+import scene2d.ImageJson;
+import scene2d.InterpolationType;
+import scene2d.Map;
+import scene2d.Scene;
+import scene2d.Sprite;
+import web.laf.lite.layout.HorizontalFlowLayout;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
+import web.laf.lite.widget.CenterPanel;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.lwjgl.LwjglAWTCanvas;
+import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 import com.badlogic.gdx.backends.lwjgl.LwjglCanvas;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.GL20;
@@ -48,17 +68,23 @@ import com.badlogic.gdx.utils.Timer.Task;
 final public class StudioPanel extends JPanel  {
 	private static final long serialVersionUID = 1L;
 	LwjglCanvas can;
-	LwjglAWTCanvas canvas;
+	public LwjglAWTCanvas canvas;
+	JPanel hbox;
+	CenterPanel centerPanel;
+	JScrollPane scrollPane;
+	LwjglApplicationConfiguration config2 = new LwjglApplicationConfiguration();
 	Image img;
 	public StudioPanel(){
 		super(new VerticalFlowLayout());
-		try {
+		hbox = new JPanel(new HorizontalFlowLayout());
-			img = ImageIO.read(Icon.getResourceAsStream("background.png"));
+		hbox.add(new HeaderLabel("Screen Size"));
-		} catch (IOException e) {
+		hbox.add(new HeaderLabel("Target Size"));
-			e.printStackTrace();
-		}
 		UIUtils.setMargin(this, new Insets(15,15,15,15));
+		config2.width = 640;
+		config2.height = 320;
+		config2.fullscreen = false;
+		config2.useGL20 = false;
 	}
@@ -104,21 +130,25 @@ final public class StudioPanel extends JPanel  {
 	public void createStudioCanvas(){
 		removeAll();
-		Main.log("Creating Studio Canvas");
+		GdxStudio.log("Creating Studio Canvas");
 		try{
-			Stage.configJson = Stage.jsonReader.parse(config);
+			Scene.configJson = Scene.jsonReader.parse(config);
-			Stage.targetWidth = 800; // Once designed in this don't change only change the screen width
-			Stage.targetHeight = 480;// Once designed in this don't change only change the screen height
-			Stage.debug = true;
+			Scene.debug = true;
 			Scene.scenesMap.clear();
-			Scene.scenesMap.put("SceneEditor", "");
+			Scene.scenesMap.put("gdxstudio.SceneEditor", "");
-			//can = new LwjglCanvas(stage, false);
 			setOpaque(false);
-			canvas = new  LwjglAWTCanvas(Stage.getInstance() , false);
+			canvas = new  LwjglAWTCanvas(Scene.app , false);
-			JScrollPane scrollPane = new JScrollPane(canvas.getCanvas());
+			scrollPane = new JScrollPane(canvas.getCanvas());
 			scrollPane.setPreferredSize(new Dimension(800, 480));
 			UIUtils.setDrawBorder(scrollPane, false);
+			Style.setScreenSize(scrollPane.getPreferredSize().width, scrollPane.getPreferredSize().height);
+			centerPanel = new CenterPanel(scrollPane, true, false);
+			centerPanel.setBackground(Color.black);
+			UIUtils.setUndecorated(centerPanel, true);
+			UIUtils.setMargin(centerPanel, new Insets(0,0,0,0));
-			add(scrollPane);
+			add(centerPanel);
+			validate();
+			Style.setScreenPosition(scrollPane.getLocation().x, scrollPane.getLocation().y);
 			canvas.getCanvas().setDropTarget(new DropTarget() {
 				private static final long serialVersionUID = 1L;
 				public synchronized void drop(DropTargetDropEvent event) {
@@ -146,8 +176,38 @@ final public class StudioPanel extends JPanel  {
 		}
 	}
+	public void setGdxScreenSize(int width, int height){
+		removeAll();
+		canvas.getCanvas().setSize(width, height);
+		scrollPane = new JScrollPane(canvas.getCanvas());
+		scrollPane.setPreferredSize(new Dimension(width, height));
+		UIUtils.setDrawBorder(scrollPane, false);
+		Style.setScreenSize(scrollPane.getPreferredSize().width, scrollPane.getPreferredSize().height);
+		scrollPane.setPreferredSize(new Dimension(width, height));
+		centerPanel = new CenterPanel(scrollPane, true, false);
+		centerPanel.setBackground(Color.black);
+		UIUtils.setUndecorated(centerPanel, true);
+		UIUtils.setMargin(centerPanel, new Insets(0,0,0,0));
+		add(centerPanel);
+		validate();
+		Style.setScreenPosition(scrollPane.getLocation().x, scrollPane.getLocation().y);
+		canvas.makeCurrent();
+        try {
+			GLContext.useContext(canvas);
+		} catch (LWJGLException e) {
+			e.printStackTrace();
+		}
+	}
+	public void revalidateScreenPosition(){
+		if(scrollPane != null){
+			validate();
+			Style.setScreenPosition(canvas.getCanvas().getLocation().x, canvas.getCanvas().getLocation().y);
+		}
+	}
 	public void destroyCanvas(){
-		Main.log("Destroying Scene Canvas");
+		GdxStudio.log("Destroying Scene Canvas");
 		if(canvas != null){
 			remove(canvas.getCanvas());
 			canvas.stop();
@@ -157,7 +217,7 @@ final public class StudioPanel extends JPanel  {
 	private int getNameCount(Actor actor){
 		int count = 1;
-		for(Actor child: Stage.getChildren())
+		for(Actor child: Scene.getCurrentScene().getChildren())
 			if(actor.getClass().equals(child.getClass())) count++;
 		return count;
 	}
@@ -168,15 +228,15 @@ final public class StudioPanel extends JPanel  {
 			@Override
 			public void run() {
 				String name = actor.getClass().getSimpleName()+getNameCount(actor);
-				if(Stage.findActor(name) == null)
+				if(Scene.getCurrentScene().findActor(name) == null)
 					actor.setName(name);
 				else
 					actor.setName(name+"_1");
-				actor.setX(Stage.mouse.x-actor.getWidth()/2);
+				actor.setX(Scene.mouse.x-actor.getWidth()/2);
-				actor.setY(Stage.mouse.y-actor.getHeight()/2);
+				actor.setY(Scene.mouse.y-actor.getHeight()/2);
-				Stage.addActor(actor);
+				Scene.getCurrentScene().addActor(actor);
 				Frame.actorPanel.addActor(actor.getName());
-				SceneEditor.isDirty = true;
+				Scene.isDirty = true;
 				Effect.createEffect(actor, EffectType.ScaleInOut, 1.5f, 0.5f, InterpolationType.Linear);
 			}
 		}, 0.1f);
@@ -215,7 +275,6 @@ final public class StudioPanel extends JPanel  {
 			case "Dialog":setName(new Dialog("Title", Asset.skin));break;
 			case "Touchpad":setName(new Touchpad(5, Asset.skin));break;
 			case "Map":setName(new Map(1, 24));break;
 			case "None":break;
 			default:break;
 		}
@@ -225,7 +284,7 @@ final public class StudioPanel extends JPanel  {
 		StringBuilder sb = new StringBuilder();
 		for(String filename: new File(Asset.basePath+"font").list()){
 			if(filename.endsWith(".fnt")){
-				Main.log("Loading :"+filename);
+				GdxStudio.log("Loading :"+filename);
 				sb.append(filename);
 				sb.append(",");
 			}
@@ -234,7 +293,7 @@ final public class StudioPanel extends JPanel  {
 		sb = new StringBuilder();
 		for(String filename: new File(Asset.basePath+"atlas").list()){
 			if(filename.endsWith(".atlas")){
-				Main.log("Loading :"+filename);
+				GdxStudio.log("Loading :"+filename);
 				sb.append(filename);
 				sb.append(",");
 			}
@@ -243,7 +302,7 @@ final public class StudioPanel extends JPanel  {
 		sb = new StringBuilder();
 		for(String filename: new File(Asset.basePath+"sound").list()){
 			if(filename.endsWith(".mp3")){
-				Main.log("Loading :"+filename);
+				GdxStudio.log("Loading :"+filename);
 				sb.append(filename);
 				sb.append(",");
 			}
@@ -252,12 +311,19 @@ final public class StudioPanel extends JPanel  {
 		sb = new StringBuilder();
 		for(String filename: new File(Asset.basePath+"music").list()){
 			if(filename.endsWith(".mp3")){
-				Main.log("Loading :"+filename);
+				GdxStudio.log("Loading :"+filename);
 				sb.append(filename);
 				sb.append(",");
 			}
 		}
 		Asset.assetMap.put("music", sb.toString());
+		sb = new StringBuilder();
+		for(String filename: new File(Asset.basePath+"model").list()){
+			if(filename.endsWith(".obj") || filename.endsWith(".g3db")){
+				GdxStudio.log("Loading :"+filename);
+				Asset.modelMap.add(filename);
+			}
+		}
 	}
 	private static int counter = 1;

{Panel → src/gdxstudio/panel}/TablePanel.java RENAMED Viewed

@@ -1,3 +1,7 @@
+package gdxstudio.panel;
+import gdxstudio.GdxStudio;
+import gdxstudio.Style;
 import java.awt.Component;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -40,7 +44,7 @@ public class TablePanel extends JPanel implements ActionListener {
 		//createProperty("OX ", createSpinner() ,  "OY ", createSpinner());
 		createProperty("Width", createSpinner(), "Height", createSpinner());
 		//createProperty("Height", createSpinner());
-		Main.log("COMPK"+getProperty("Y"));
+		GdxStudio.log("COMPK"+getProperty("Y"));
 		setProperty("X", 500);
 	}

{Panel → src/gdxstudio/panel}/WidgetPanel.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.panel;
 import java.awt.Dimension;
 import java.awt.datatransfer.StringSelection;
 import java.awt.dnd.DnDConstants;
@@ -10,8 +11,13 @@ import java.awt.dnd.DragSourceEvent;
 import java.awt.dnd.DragSourceListener;
 import java.awt.event.ActionEvent;
+import javax.swing.JList;
+import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
+import web.laf.lite.layout.HorizontalFlowLayout;
+import web.laf.lite.utils.UIUtils;
 public class WidgetPanel extends BaseList implements DragSourceListener, DragGestureListener {
 	private static final long serialVersionUID = 1L;
@@ -19,14 +25,26 @@ public class WidgetPanel extends BaseList implements DragSourceListener, DragGes
 	String[] btns = new String[]{
 			"New Widget", "new","Delete", "trash"
 	};
+	private JPanel hbox = new JPanel(new HorizontalFlowLayout());
+	StyleList sl = new StyleList();
+	StyleTable st = new StyleTable();
 	public WidgetPanel(){
 		super("Widgets", "Label","Image", "Sprite", "Button","TextButton", "CheckBox",
 				"List", "SelectBox", "Slider", "TextField",
-				"Table", "Dialog", "Touchpad", "Map");
+				"Table", "Dialog", "Touchpad", "Model");
-		scrollPane.setPreferredSize(new Dimension(200, 50));
+		list.setLayoutOrientation(JList.HORIZONTAL_WRAP);
 		dragSource.addDragSourceListener(this);
 	    dragSource.createDefaultDragGestureRecognizer(list, DnDConstants.ACTION_MOVE, this);
+	    hbox.add(list);
+	    hbox.add(sl);
+	    hbox.add(st);
+	    //this.remove(scrollPane);
+	    UIUtils.setDrawBorder(scrollPane, true);
+	    scrollPane.setPreferredSize(new Dimension(200, 150));
+	    scrollPane.setViewportView(hbox);
+	    add(scrollPane);
 	}
 	@Override
@@ -36,32 +54,23 @@ public class WidgetPanel extends BaseList implements DragSourceListener, DragGes
 	@Override
 	public void dragEnter(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
 	}
 	@Override
 	public void dragExit(DragSourceEvent arg0) {
-		// TODO Auto-generated method stub
 	}
 	@Override
 	public void dragOver(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
 	}
 	@Override
 	public void dropActionChanged(DragSourceDragEvent arg0) {
-		// TODO Auto-generated method stub
 	}
 	@Override
 	public void dragGestureRecognized(DragGestureEvent event) {
 	    StringSelection text = new StringSelection(list.getSelectedValue());
@@ -76,3 +85,28 @@ public class WidgetPanel extends BaseList implements DragSourceListener, DragGes
 	public void actionPerformed(ActionEvent arg0) {
 	}
 }
+class StyleList extends BaseList {
+	private static final long serialVersionUID = 1L;
+	public StyleList(){
+		super("Styles", "LabelStyle", "ButtonStyle");
+	}
+	@Override
+	public void valueChanged(ListSelectionEvent arg0) {
+	}
+}
+class StyleTable extends BaseTable {
+	private static final long serialVersionUID = 1L;
+	public StyleTable(){
+		super("Properties");
+	}
+	@Override
+	public void clear(String... items){
+		super.clear("StyleName", "", "", "", "");
+	}
+}

{Parser → src/gdxstudio/parser}/Java.g4 RENAMED Viewed

File without changes

{Parser → src/gdxstudio/parser}/Java.tokens RENAMED Viewed

File without changes

{Parser → src/gdxstudio/parser}/JavaBaseListener.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.parser;
 // Generated from Java.g4 by ANTLR 4.2
 import org.antlr.v4.runtime.ParserRuleContext;

{Parser → src/gdxstudio/parser}/JavaLexer.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.parser;
 // Generated from Java.g4 by ANTLR 4.2
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;

{Parser → src/gdxstudio/parser}/JavaLexer.tokens RENAMED Viewed

File without changes

{Parser → src/gdxstudio/parser}/JavaListener.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.parser;
 // Generated from Java.g4 by ANTLR 4.2
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTreeListener;

{Parser → src/gdxstudio/parser}/JavaParser.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package gdxstudio.parser;
 // Generated from Java.g4 by ANTLR 4.2
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;

{Stage → src/scene2d}/Asset.java RENAMED Viewed

@@ -1,3 +1,6 @@
+package scene2d;
+import scene3d.Actor3d;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
@@ -11,6 +14,7 @@ import com.badlogic.gdx.graphics.g3d.Model;
 import com.badlogic.gdx.maps.tiled.TiledMap;
 import com.badlogic.gdx.maps.tiled.TmxMapLoader;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.ArrayMap;
 import com.badlogic.gdx.utils.JsonValue;
@@ -26,14 +30,14 @@ import com.badlogic.gdx.utils.JsonValue;
  *	2. Automatic Asset Loading the directory Structure should be like this <br>
  *
  *  <p>
- *  assets/icon.png  --- your game icon to be displayed on the window<br>
+ *  icon.png  --- your game icon to be displayed on the window<br>
- *	assets/atlas/  --- all your Texture Atlas files .atlas and .png go here<br>
+ *	atlas/  --- all your Texture Atlas files .atlas and .png go here<br>
- *	assets/font/  --- all your BitmapFont files .fnt and .png go here<br>
+ *	font/  --- all your BitmapFont files .fnt and .png go here<br>
- *	assets/music/  --- all your Music files .mp3 go here<br>
+ *	music/  --- all your Music files .mp3 go here<br>
- *	assets/sound/  --- all your Music files .mp3 go here<br>
+ *	sound/  --- all your Music files .mp3 go here<br>
- *	assets/particle/  --- all your Particle files .part go here<br>
+ *	particle/  --- all your Particle files .part go here<br>
- *	assets/map/  --- all your TMX map files along with tilesets go here<br>
+ *	map/  --- all your TMX map files along with tilesets go here<br>
- *	assets/pack/  --- all your image files which are to be packed are to be stored here<br>
+ *	pack/  --- all your image files which are to be packed are to be stored here<br>
  *					  so that they are automatically packed by the texture packer and stored in
  *					  the atlas folder
  *
@@ -79,6 +83,8 @@ public final class Asset {
 	public final static ArrayMap<String, Sound> soundMap = new ArrayMap<String, Sound>();
 	public final static ArrayMap<String, BitmapFont> fontMap = new ArrayMap<String, BitmapFont>();
 	public final static ArrayMap<String, TextureRegion> texMap = new ArrayMap<String, TextureRegion>();
+	public final static ArrayMap<String, TextureRegion> particleMap = new ArrayMap<String, TextureRegion>();
+	public final static Array<String> modelMap = new Array<String>();
 	private static Music currentMusic = null;
 	public static String currentMusicName = ""; //Only file name no prefix or suffix
@@ -88,7 +94,7 @@ public final class Asset {
 	private static boolean updatinglock = false;
 	/* This is to be used by Gdx Studio */
-	static String basePath = "";
+	public static String basePath = "";
 	public static boolean musicOn = true;
 	public static boolean soundOn = false;
@@ -98,8 +104,10 @@ public final class Asset {
 		assetMap.clear();
 		fontMap.clear();
 		texMap.clear();
+		particleMap.clear();
 		musicMap.clear();
 		soundMap.clear();
+		modelMap.clear();
 	}
 	public static void load(){
@@ -138,16 +146,16 @@ public final class Asset {
 				assetMan.setLoader(TiledMap.class, new TmxMapLoader(new InternalFileHandleResolver()));
 				getAssets();
 				updatinglock = true;
-				if(Stage.splashDuration != 0)
+				if(Scene.splashDuration != 0)
-					Stage.nextSceneWithDelay(Stage.splashDuration);
+					Scene.nextSceneWithDelay(Scene.splashDuration);
 				else
-					Stage.nextScene();
+					Scene.nextScene();
 			}
 		return updatinglock;
 	}
 	public static void loadAssets(){
-		JsonValue sv = Stage.jsonReader.parse(Gdx.files.internal(Asset.basePath+"asset"));
+		JsonValue sv = Scene.jsonReader.parse(Gdx.files.internal(Asset.basePath+"asset"));
  		for(JsonValue jv: sv.iterator())
  			assetMap.put(jv.name, jv.asString());
  		for(String font: assetMap.get("font").split(",")){
@@ -189,7 +197,8 @@ public final class Asset {
  				musicMap.put(ext(music), assetMan.get(basePath+"music/"+music, Music.class));
  		}
  		skin = assetMan.get(basePath+"skin/uiskin.json", Skin.class);
+ 		if(Scene.configJson.getBoolean("showFPS"))
-		Stage.setup();
+ 			Scene.setupFps();
 	}
 	private static String ext(String file){
@@ -197,7 +206,7 @@ public final class Asset {
 	}
 	public static void save(){
-		Gdx.files.local(Asset.basePath+"asset").writeString(Stage.json.toJson(assetMap, ArrayMap.class, String.class), false);
+		Gdx.files.local(Asset.basePath+"asset").writeString(Scene.json.toJson(assetMap, ArrayMap.class, String.class), false);
 	}
 /***********************************************************************************************************
@@ -216,7 +225,7 @@ public final class Asset {
 					else
 						musicStop();
 			if(musicMap.containsKey(filename)){
-				Stage.log("Music: playing "+filename);
+				Scene.log("Music: playing "+filename);
 				currentMusic = musicMap.get(filename);//Gdx.audio.newMusic(Gdx.files.internal("music/"+filename));
 				currentMusic.setVolume(Config.volMusic);
 				currentMusic.setLooping(true);
@@ -224,7 +233,7 @@ public final class Asset {
 				currentMusicName = filename;
 			}
 			else{
-				Stage.log("Music File Not Found: "+filename);
+				Scene.log("Music File Not Found: "+filename);
 			}
 		}
 	}
@@ -233,7 +242,7 @@ public final class Asset {
 	public static void musicPause(){
 		if(currentMusic != null)
 			if(currentMusic.isPlaying()){
-				Stage.log("Music: pausing "+currentMusicName);
+				Scene.log("Music: pausing "+currentMusicName);
 				currentMusic.pause();
 			}
 	}
@@ -242,7 +251,7 @@ public final class Asset {
 	public static void musicResume(){
 		if(currentMusic != null)
 			if(!currentMusic.isPlaying()){
-				Stage.log("Music: resuming "+currentMusicName);
+				Scene.log("Music: resuming "+currentMusicName);
 				currentMusic.play();
 			}
 		else
@@ -252,7 +261,7 @@ public final class Asset {
 	/** Stops the current music file being played */
 	public static void musicStop(){
 		if(currentMusic != null){
-			Stage.log("Music: stoping "+currentMusicName);
+			Scene.log("Music: stoping "+currentMusicName);
 			currentMusic.stop();
 			currentMusic = null;
 		}
@@ -284,10 +293,10 @@ public final class Asset {
 				long id = currentSound.play(Config.volSound);
 				currentSound.setLooping(id, false);
 				currentSound.setPriority(id, 99);
-				Stage.log("Sound:"+"Play "+ filename);
+				Scene.log("Sound:"+"Play "+ filename);
 			}
 			else{
-				Stage.log("Music File Not Found: "+filename);
+				Scene.log("Music File Not Found: "+filename);
 			}
 		}
 	}
@@ -299,34 +308,34 @@ public final class Asset {
 			long id = currentSound.play(Config.volSound);
 			currentSound.setLooping(id, false);
 			currentSound.setPriority(id, 99);
-			Stage.log("Sound:"+"Play "+ "click");
+			Scene.log("Sound:"+"Play "+ "click");
 		}
 	}
 	/** Pauses the current sound file being played */
 	public static void soundPause(){
-		Stage.log("Sound:"+"Pausing");
+		Scene.log("Sound:"+"Pausing");
 		if(currentSound != null)
 			currentSound.pause();
 	}
 	/** Resumes the current sound file being played */
 	public static void soundResume(){
-		Stage.log("Sound:"+"Resuming");
+		Scene.log("Sound:"+"Resuming");
 		if(currentSound != null)
 			currentSound.resume();
 	}
 	/** Stops the current sound file being played */
 	public static void soundStop(){
-		Stage.log("Sound:"+"Stopping");
+		Scene.log("Sound:"+"Stopping");
 		if(currentSound != null)
 			currentSound.stop();
 	}
 	/** Disposes the current sound file being played */
 	public static void soundDispose(){
-		Stage.log("Sound:"+"Disposing Sound");
+		Scene.log("Sound:"+"Disposing Sound");
 		if(currentSound != null)
 			currentSound.dispose();
 	}
@@ -346,7 +355,7 @@ public final class Asset {
 			return fontMap.get(fontname);
 		}
 		else{
-			Stage.log("Font File Not Found: "+fontname);
+			Scene.log("Font File Not Found: "+fontname);
 			return null;
 		}
 	}
@@ -364,7 +373,7 @@ public final class Asset {
 			return texMap.get(textureregionName);
 		}
 		else{
-			Stage.log("TextureRegion Not Found: "+textureregionName);
+			Scene.log("TextureRegion Not Found: "+textureregionName);
 			return null;
 		}
 	}
@@ -556,40 +565,40 @@ public final class Asset {
 	 * Logs all the TextureRegions that are loaded and cached
 	 */
 	public static void logTextures(){
-		Stage.log("BEGIN logging Textures------------------");
+		Scene.log("BEGIN logging Textures------------------");
 		for(String na: texMap.keys())
-			Stage.log(na);
+			Scene.log(na);
-		Stage.log("END logging Textures------------------");
+		Scene.log("END logging Textures------------------");
 	}
 	/*
 	 * Logs all the BitmapFonts that are loaded and cached
 	 */
 	public static void logFonts(){
-		Stage.log("BEGIN logging Fonts------------------");
+		Scene.log("BEGIN logging Fonts------------------");
 		for(String na: fontMap.keys())
-			Stage.log(na);
+			Scene.log(na);
-		Stage.log("END logging Fonts------------------");
+		Scene.log("END logging Fonts------------------");
 	}
 	/*
 	 * Logs all the Sounds that are loaded and cached
 	 */
 	public static void logSounds(){
-		Stage.log("BEGIN logging Sounds------------------");
+		Scene.log("BEGIN logging Sounds------------------");
 		for(String na: soundMap.keys())
-			Stage.log(na);
+			Scene.log(na);
-		Stage.log("END logging Sounds------------------");
+		Scene.log("END logging Sounds------------------");
 	}
 	/*
 	 * Logs all the Music that are loaded and cached
 	 */
 	public static void logMusics(){
-		Stage.log("BEGIN logging Musics------------------");
+		Scene.log("BEGIN logging Musics------------------");
 		for(String na: musicMap.keys())
-			Stage.log(na);
+			Scene.log(na);
-		Stage.log("END logging Musics------------------");
+		Scene.log("END logging Musics------------------");
 	}
 	/*

src/scene2d/Camera.java ADDED Viewed

@@ -0,0 +1,284 @@
+package scene2d;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.math.Rectangle;
+public class Camera extends OrthographicCamera {
+	private static Camera instance;
+	private static float duration;
+	private static float time;
+	private static Interpolation interpolation;
+	private static boolean moveCompleted;
+	private static float lastPercent;
+	private static float percentDelta;
+	private static float panSpeedX, panSpeedY;
+	private static final Array<Actor> hudActors = new Array<Actor>();
+	private static Actor followedActor = null;
+	private static float followSpeed = 1f;
+	/*
+	 *  This is to set the offsets of camera position when following the actor
+	 *  When the camera follows the actor its (x,y) position is set to actor's (x,y) position
+	 *  based on followSpeed. The offsets are used to position the camera in such a way that the actor
+	 *  doesn't need to be at the center of the camera always
+	 */
+	public static Rectangle followOffset = new Rectangle(10,70,10,60);
+	private static boolean followContinous = false;
+	public static boolean usePan = false;
+    public static boolean useDrag = false;
+	/*
+	 * Sets the speed at which the camera pans. By default it moves 1px for a duration a 1f
+	 * so its speed is 1px/f. So reduce the duration to increase its speed.
+	 * ex: setPanSpeed(0.5) will change its speed to 2px/f
+	 * Here: f can/maybe also indicate seconds
+	 */
+	public static float panSpeed = 5f;
+	public static Rectangle panSize;
+	/*
+	 *  This sets the boundary of the camera till what position can it move or pan in the
+	 *  directions left, right, top, down. This is to prevent is from panning overboard the game area.
+	 *  Usually the bounds of the camera is like a rectangle. This must be calculated carefully
+	 *  as the camera's position is based on its center.
+	*/
+	public static Rectangle bounds = new Rectangle(0,0,999,999);
+	Camera(){
+		setToOrtho(false, Scene.targetWidth, Scene.targetHeight);
+		position.set(Scene.targetWidth/2, Scene.targetHeight/2, 0);
+		instance = this;
+		panSize = new Rectangle(10, 10, Scene.targetWidth-10, Scene.targetHeight - 10);
+	}
+	/*
+	 * Moves the camera to x,y over a time duration
+	 */
+	public void moveTo(float x, float y, float duration) {
+		moveBy(x-position.x, y-position.y, duration);
+	}
+	/*
+	 * Moves the camera by amountX, amountY over a time duration
+	 */
+	public static void moveBy (float amountX, float amountY, float duration) {
+		moveBy(amountX, amountY, duration, null);
+	}
+	/*
+	 * Moves the camera by amountX, amountY over a time duration and interpolation interp
+	 */
+	public static void moveBy (float amountX, float amountY, float dur, Interpolation interp) {
+		duration = dur;
+		interpolation = interp;
+		panSpeedX = amountX;
+		panSpeedY = amountY;
+		lastPercent = 0;
+		time = 0;
+		moveCompleted = false;
+	}
+	private static Rectangle cullRect = new Rectangle();
+	private void moveByAction(float delta){
+		time += delta;
+		moveCompleted = time >= duration;
+		float percent;
+		if (moveCompleted)
+			percent = 1;
+		else {
+			percent = time / duration;
+			if (interpolation != null) percent = interpolation.apply(percent);
+		}
+		percentDelta = percent - lastPercent;
+		if(Scene.cullingEnabled){
+			cullRect.set(getXLeft(), getYBot(), Scene.targetWidth, Scene.targetHeight);
+			Scene.getCurrentScene().setCullingArea(cullRect);
+		}
+		translate(panSpeedX * percentDelta, panSpeedY * percentDelta, 0);
+		for(Actor actor: hudActors)
+			actor.setPosition(actor.getX()+panSpeedX * percentDelta, actor.getY()+panSpeedY * percentDelta);
+		lastPercent = percent;
+		if (moveCompleted) interpolation = null;
+	}
+	public void resetCamera(){
+		position.set(Scene.targetWidth/2, Scene.targetHeight/2, 0);
+	}
+	/*
+	 * This makes the camera follow the actor once and only once. Once the camera reaches its
+	 * target, it stops following the actor.
+	 */
+	public static void followActor(Actor actor){
+		followedActor = actor;
+		followContinous = false;
+	}
+	/*
+	 * This makes the camera follow the actor continuously, even after the camera reaches its
+	 * target, it keeps following the if the actor changes its position.
+	 */
+	public static void followActorContinuously(Actor actor){
+		followedActor = actor;
+		followContinous = true;
+	}
+	/*
+	 * Sets the speed at which the camera follows the actor. By default it moves 1px for a duration of 1f
+	 * so its speed is 1px/f. So reduce the duration to increase its speed.
+	 * ex: setPanSpeed(0.5) will change its speed to 2px/f
+	 * Here: f can/maybe also indicate seconds
+	 */
+	public static void setFollowSpeed(float duration){
+		followSpeed = duration;
+	}
+	private void follow(){
+		//if(camera.position.x == followedActor.getX()+followLeftOffset &&
+		//	camera.position.y == followedActor.getY()+followTopOffset)
+		//return;
+		//moveTo(followedActor.getX()+followLeftOffset, followedActor.getY()+followTopOffset, 100f);
+		if(position.x < followedActor.getX() - followOffset.x) moveBy(1f, 0, followSpeed);
+		else if(position.x > followedActor.getX() + followOffset.width) moveBy(-1f, 0, followSpeed);
+		else if(position.y < followedActor.getY() - followOffset.y) moveBy(0, 1f, followSpeed);
+		else if(position.y > followedActor.getY() - followOffset.height) moveBy(0, -1f, followSpeed);
+		else {
+			if(!followContinous)
+				followedActor = null;
+		}
+	}
+	@Override
+	public void update(){
+		super.update();
+		Scene.mouse.x = Gdx.input.getX();
+		Scene.mouse.y = Gdx.graphics.getHeight() - Gdx.input.getY();
+		if(!moveCompleted)
+			moveByAction(Scene.stateTime);//FIXME
+		if(usePan)
+			panCameraWithMouse();
+		if(followedActor != null)
+			follow();
+	}
+	private void panCameraWithMouse(){
+		 if(Scene.mouse.x > panSize.width && getXLeft() < bounds.width) moveBy(1f, 0, panSpeed);
+		 else if(Scene.mouse.x < panSize.x  && getXLeft() > bounds.x)  moveBy(-1f, 0, panSpeed);
+		 else if(Scene.mouse.y < panSize.y && getYBot() > bounds.y) moveBy(0, -1f, panSpeed);
+		 else if(Scene.mouse.y > panSize.height && getYBot() < bounds.height) moveBy(0, 1f, panSpeed);
+	}
+	private final static Vector3 curr = new Vector3();
+	private final static Vector3 last = new Vector3(-1, -1, -1);
+	private final static Vector3 deltaDrag = new Vector3();
+	private static float deltaCamX = 0;
+	private static float deltaCamY = 0;
+	public static void dragCam(int x, int y){
+		instance.unproject(curr.set(x, y, 0));
+    	if (!(last.x == -1 && last.y == -1 && last.z == -1)) {
+    		instance.unproject(deltaDrag.set(last.x, last.y, 0));
+    		deltaDrag.sub(curr);
+    		deltaCamX = deltaDrag.x + instance.position.x;
+    		deltaCamY = deltaDrag.y + instance.position.y;
+    		if(deltaCamX > bounds.x && deltaCamX < bounds.x+bounds.width)
+    			moveBy(deltaDrag.x, 0f, 0f);
+    		if(deltaCamY > bounds.y && deltaCamY < bounds.y+bounds.height)
+    			moveBy(0f, deltaDrag.y, 0f);
+    	}
+    	last.set(x, y, 0);
+    }
+	public static void resetDrag(){
+		last.set(-1, -1, -1);
+	}
+	public static void reset(){
+		usePan = false;
+		followActor(null);
+		clearAllHud();
+		instance.position.set(Scene.targetWidth/2, Scene.targetHeight/2, 0);
+	}
+	/* If you want to make any elements/actors to move along with the camera
+	 * like HUD's add them using this method */
+	public static void addHud(Actor actor){
+		if(actor != null){
+			Scene.getCurrentScene().addActor(actor);
+			hudActors.add(actor);
+		}
+	}
+	/* If you want to make any elements/actors to move along with the camera
+	 * like HUD's add them using this method */
+	public static void addHud(String actorName){
+		if(actorName != null && !actorName.isEmpty()){
+			Actor actor = Scene.getCurrentScene().findActor(actorName);
+			Scene.getCurrentScene().addActor(actor);
+			hudActors.add(actor);
+		}
+	}
+	/* If you want to any elements/actors which was a Hud the use this */
+	public static void removeHud(Actor actor){
+		Scene.getCurrentScene().removeActor(actor);
+		hudActors.removeValue(actor, true);
+	}
+	/* If you want to any elements/actors which was a Hud the use this */
+	public static void removeHud(String actorName){
+		if(actorName != null && !actorName.isEmpty()){
+			Actor actor = Scene.getCurrentScene().findActor(actorName);
+			Scene.getCurrentScene().removeActor(actor);
+			hudActors.removeValue(actor, true);
+		}
+	}
+	/*
+	 * Clears all hud's registered with the camera
+	 */
+	public static void clearAllHud(){
+		hudActors.clear();
+	}
+	/*
+	 * Returns the x position of the camera
+	 */
+	public static float getX(){
+		return instance.position.x;
+	}
+	/*
+	 * Returns the y position of the camera
+	 */
+	public static float getY(){
+		return instance.position.y;
+	}
+	public static float getXLeft(){
+		return instance.position.x - Scene.targetWidth/2;
+	}
+	public static float getYBot(){
+		return instance.position.y - Scene.targetHeight/2;
+	}
+	public static float getWidth(){
+		return instance.viewportWidth;
+	}
+	public static float getHeight(){
+		return instance.viewportHeight;
+	}
+}

{Stage → src/scene2d}/Config.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
@@ -20,8 +21,6 @@ public final class Config {
     static final String CURRENT_LEVEL = "currentlevel";
     static final String SAVEDATA= "savedata";
     static final String TOTAL_TIME= "totaltime";
-    static final String PANSCROLL = "panscroll";
-    static final String DRAGSCROLL = "dragscroll";
     static final String PANSPEED = "panspeed";
     static final String DRAGSPEED = "dragspeed";
     static final String KEYBOARD = "keyboard";
@@ -35,7 +34,6 @@ public final class Config {
     public static float volMusic;
     public static float volSound;
-    public static boolean useDrag;
     public static boolean useKeyboard;
     public static float speedPan;
@@ -44,15 +42,13 @@ public final class Config {
     private static int score;
     static void setup(){
-       prefs = Gdx.app.getPreferences(Stage.configJson.getString("title"));
+       prefs = Gdx.app.getPreferences(Scene.configJson.getString("title"));
        isMusic = prefs.getBoolean(MUSIC, true);
        isSound = prefs.getBoolean(SOUND, true);
        volMusic = prefs.getFloat(VOLUME_MUSIC, 1f);
        volSound = prefs.getFloat(VOLUME_SOUND, 1f);
-       Stage.usePan = prefs.getBoolean(PANSCROLL, true);
-       useDrag = prefs.getBoolean(DRAGSCROLL, true);
        useKeyboard = prefs.getBoolean(KEYBOARD, true);
        speedPan = prefs.getFloat(PANSPEED, 5f);
@@ -127,19 +123,6 @@ public final class Config {
         prefs.flush();
     }
-    public static void setPanScroll(boolean ue){
-        prefs.putBoolean(PANSCROLL, ue);
-        prefs.flush();
-        Stage.usePan = ue ;
-    }
-    public static void setDragScroll(boolean ue){
-        prefs.putBoolean(DRAGSCROLL, ue);
-        prefs.flush();
-        useDrag = ue;
-    }
     public static void setPanSpeed(float ue){
         prefs.putFloat(PANSPEED, ue);
         prefs.flush();

{Stage → src/scene2d}/Effect.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.scenes.scene2d.Action;
@@ -17,38 +18,12 @@ public class Effect {
 		if(actor == null)
 			return;
 		Interpolation interp = InterpolationType.getInterpolation(type);
+		float x = 0;//actor.getX();
+		float y = 0;//actor.getY();
 		switch(effectType){
-			case FadeInOut:
-				actor.addAction(fadeInOut(value, duration, interp));
-				break;
-			case FadeInOutLooping:
-				actor.addAction(Actions.forever(fadeInOut(value, duration, interp)));
-				break;
-			case FadeInOutRemoveActor:
-				break;
-			case ScaleInOut:
-				actor.addAction(scaleInOut(value, duration, interp));
-				break;
-			case ScaleInOutLooping:
-				actor.addAction(Actions.forever(scaleInOut(value, duration, interp)));
-				break;
-			case ScaleInOutRemoveActor:
-				actor.addAction(Actions.sequence(scaleInOut(value, duration, interp), Actions.removeActor(actor)));
-				break;
-			case ShakeInOut:
-				actor.addAction(shakeInOut(value, duration, interp));
-				break;
-			case ShakeInOutLooping:
-				actor.addAction(Actions.forever(shakeInOut(value, duration, interp)));
-				break;
-			case ShakeInOutRemoveActor:
-				actor.addAction(Actions.sequence(shakeInOut(value, duration, interp), Actions.removeActor(actor)));
-				break;
 			case ScaleToThenFadeOut:
 				actor.addAction(Actions.sequence(Actions.scaleTo(value, value, duration, interp)));
 				break;
 			case PatrolX:
 				actor.addAction(Actions.forever(Actions.sequence(Actions.moveBy(value, 0, duration, interp),
 						Actions.moveBy(-value, 0, duration, interp))));
@@ -59,6 +34,48 @@ public class Effect {
 						Actions.moveBy(0, -value, duration, interp))));
 				break;
+			case SlideLeft:
+				actor.setPosition(999, y);
+				actor.addAction(Actions.moveTo(x, y, duration, interp));
+				break;
+			case SlideRight:
+				actor.setPosition(-999, y);
+				actor.addAction(Actions.moveTo(x, y, duration, interp));
+				break;
+			case SlideUp:
+				actor.setPosition(x, -999);
+				actor.addAction(Actions.moveTo(x, y, duration, interp));
+				break;
+			case SlideDown:
+				actor.setPosition(x, 999);
+				actor.addAction(Actions.moveTo(x, y, duration, interp));
+				break;
+			case FadeIn:
+				Color color = actor.getColor();
+				color.a = 0f;
+				actor.setColor(color);
+				actor.addAction(Actions.fadeIn(duration, interp));
+				break;
+			case FadeOut:
+				Color color2 = actor.getColor();
+				color2.a = 1f;
+				actor.setColor(color2);
+				actor.addAction(Actions.fadeOut(duration, interp));
+				break;
+			case FadeInOut:
+				actor.addAction(fadeInOut(value, duration, interp));
+				break;
+			case ScaleIn:
+				actor.setScale(0, 0);
+				actor.addAction(Actions.scaleTo(1, 1, duration, interp));
+				break;
+			case ScaleOut:
+				actor.setScale(1, 1);
+				actor.addAction(Actions.scaleTo(0, 0, duration, interp));
+				break;
+			case ScaleInOut:
+				actor.addAction(scaleInOut(value, duration, interp));
+				break;
 			case None:
 				break;
 			default:
@@ -152,79 +169,4 @@ public class Effect {
 		Interpolation.sine,  Interpolation.sineIn,  Interpolation.sineOut,
 		Interpolation.swing,  Interpolation.swingIn,  Interpolation.swingOut,
 	};
-	/***********************************************************************************************************
-	 * 					Transition Related Functions												   	       *
-	 ************************************************************************************************************/
-	public static void transition(TransitionType transitionType, Actor actor, float duration,
-			InterpolationType interptype){
-		switch(transitionType){
-			case None: break;
-			case leftToRight: transitionLeftToRight(actor, duration, interptype);break;
-			case rightToLeft: transitionRightToLeft(actor, duration, interptype);break;
-			case upToDown: transitionUpToDown(actor, duration, interptype);break;
-			case downToUp: transitionDownToUp(actor, duration, interptype);break;
-			case FadeIn: transitionFadeIn(actor, duration, interptype);break;
-			case FadeOut: transitionFadeOut(actor, duration, interptype);break;
-			case ScaleIn: transitionScaleIn(actor, duration, interptype);break;
-			case ScaleOut: transitionScaleOut(actor, duration, interptype);break;
-		}
-	}
-	private static void transitionLeftToRight(Actor actor, float duration, InterpolationType interptype){
-		actor.setPosition(-999, 0);
-		actor.addAction(Actions.moveTo(0, 0, duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionRightToLeft(Actor actor, float duration, InterpolationType interptype){
-		actor.setPosition(999, 0);
-		actor.addAction(Actions.moveTo(0, 0, duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionUpToDown(Actor actor, float duration, InterpolationType interptype){
-		actor.setPosition(0, 999);
-		actor.addAction(Actions.moveTo(0, 0, duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionDownToUp(Actor actor, float duration, InterpolationType interptype){
-		actor.setPosition(0, -999);
-		actor.addAction(Actions.moveTo(0, 0, duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionFadeIn(Actor actor, float duration, InterpolationType interptype){
-		Color color = actor.getColor();
-		color.a = 0f;
-		actor.setColor(color);
-		actor.addAction(Actions.fadeIn(duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionFadeOut(Actor actor, float duration, InterpolationType interptype){
-		Action action2 = new Action(){
-			@Override
-			public boolean act(float delta){
-				Color color = actor.getColor();
-				color.a = 1f;
-				actor.setColor(color);
-				return true;
-			}
-		};
-		actor.addAction(Actions.sequence(Actions.fadeOut(duration, InterpolationType.getInterpolation(interptype)), action2));
-	}
-	private static void transitionScaleIn(Actor actor, float duration, InterpolationType interptype){
-		actor.setScale(0, 0);
-		actor.addAction(Actions.scaleTo(1, 1, duration, InterpolationType.getInterpolation(interptype)));
-	}
-	private static void transitionScaleOut(Actor actor, float duration, InterpolationType interptype){
-		Action action2 = new Action(){
-			@Override
-			public boolean act(float delta){
-				actor.scale(1f);
-				return true;
-			}
-		};
-		actor.addAction(Actions.sequence(Actions.scaleTo(1, 1, duration, InterpolationType.getInterpolation(interptype)), action2));
-	}
 }

src/scene2d/EffectType.java ADDED Viewed

@@ -0,0 +1,19 @@
+package scene2d;
+public enum EffectType {
+	None,
+	ScaleIn, ScaleOut, ScaleInOut, ScaleTo, ScaleToBack,
+	ShakeIn, ShakeOut, ShakeInOut, ShakeTo, ShakeToBack,
+	FadeIn, FadeOut, FadeInOut, FadeTo, FadeToBack,
+	ScaleToThenFadeOut, ScaleAndFadeOut, ScaleAndFadeIn,
+	SlideRight, SlideLeft, SlideUp, SlideDown,
+	PatrolX, PatrolY;
+}
+enum EffectDuration {
+	Once,
+	OnceToAndBack,
+	Looping,
+	LoopingToAndBack
+}

{Type → src/scene2d}/EventType.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 public enum EventType {
 	None,
 	SceneCreated,

{Stage → src/scene2d}/ImageJson.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
@@ -13,7 +14,7 @@ public class ImageJson extends Image implements Json.Serializer<ImageJson> {
 	public float addEffectDelay = 0f;
 	public EventType evtType = EventType.None;
-	public OnEventType onEvtType = OnEventType.DoEffect;
+	public Scene.OnEventType onEvtType = Scene.OnEventType.DoEffect;
 	public String eventScene = "";
@@ -41,7 +42,7 @@ public class ImageJson extends Image implements Json.Serializer<ImageJson> {
 		image.addEffectDelay = jv.getFloat("addEffectDelay");
 		image.evtType = EventType.valueOf(jv.getString("event"));
-		image.onEvtType = OnEventType.valueOf(jv.getString("onEvent"));
+		image.onEvtType = Scene.OnEventType.valueOf(jv.getString("onEvent"));
 		image.eventScene = jv.getString("eventScene");
 		createEvent(image);
 		return image;

{Type → src/scene2d}/InterpolationType.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.math.Interpolation;

{Stage → src/scene2d}/Map.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.maps.MapLayer;
 import com.badlogic.gdx.maps.MapLayers;
@@ -44,12 +45,12 @@ public class Map extends Group{
 	}
 	public void loadLayer(int layerNo){
-		Stage.log("Tiles Layer no: "+layerNo);
+		Scene.log("Tiles Layer no: "+layerNo);
 		TiledMapTileLayer layer = (TiledMapTileLayer)mlayers.get(layerNo);
 		NoOfColumns = layer.getWidth();
-		Stage.log("MapColumns: "+NoOfColumns);
+		Scene.log("MapColumns: "+NoOfColumns);
 		NoOfRows = layer.getHeight();
-		Stage.log("MapRows: "+NoOfRows);
+		Scene.log("MapRows: "+NoOfRows);
 		tiles .add(new MapActor[NoOfRows][NoOfColumns]);
 		for(int i=0; i<NoOfRows; i++)
 			for(int j=0; j<NoOfColumns; j++){
@@ -66,12 +67,12 @@ public class Map extends Group{
 		}
 		mapWidth = tileSize * NoOfColumns;
 		mapHeight = tileSize * NoOfRows;
-		Stage.mapOffsetX = mapWidth - Stage.camOffsetX;
+		//Stage.mapOffsetX = mapWidth - Stage.camOffsetX;
-		Stage.mapOffsetY = mapHeight - Stage.camOffsetYTop;
+		//Stage.mapOffsetY = mapHeight - Stage.camOffsetYTop;
 	}
 	public void loadObjects(int no){
-		Stage.log("Objects Layer no: "+no);
+		Scene.log("Objects Layer no: "+no);
 		MapLayer layer1 = mlayers.get(no);
 		mobjects = layer1.getObjects();
 	}

{Stage → src/scene2d}/MapActor.java RENAMED Viewed

@@ -1,14 +1,10 @@
+package scene2d;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.ParticleEffect;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Action;
 import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.actions.MoveByAction;
-import com.badlogic.gdx.scenes.scene2d.actions.MoveToAction;
-import com.badlogic.gdx.utils.Array;
 /** The MapActor Class
  * <p>
@@ -44,8 +40,6 @@ public class MapActor extends Actor {
 	public float particlePosX = 0.0f;
 	public float particlePosY = 0.0f;
 	public boolean isParticleEffectActive;
-  	private Array<MovedListener> movedListeners = new Array<MovedListener>();
 	// When tiles coords row and column are directly specified
 	public MapActor(int row, int col, int tileSize){
@@ -80,7 +74,7 @@ public class MapActor extends Actor {
 			batch.draw(tileImage, getX(), getY(), tileSize, tileSize);
 		//font("normal").draw(batch, ""+index, getX(), getY()+tileSize);
 		if (isAnimationActive && animation != null) {
-			keyFrame = animation.getKeyFrame(Stage.stateTime, isAnimationLooping);
+			keyFrame = animation.getKeyFrame(Scene.stateTime, isAnimationLooping);
 			batch.draw(keyFrame, getX(), getY(), tileSize, tileSize);
 		}
 		drawParticleEffect(batch);
@@ -159,42 +153,6 @@ public class MapActor extends Actor {
 		this.col = (int)this.getX()/tileSize;
 	}
-	public void moveTo(float x, float y, float duration) {
-		// Move to a specific position by time
-		MoveToAction move = new MoveToAction();
-		move.setPosition(x, y);
-		if (duration > 0.0f) {
-			move.setDuration(duration);
-		}
-		Action over = new Action() {
-			@Override
-	          public boolean act(final float it) {
-				setPosition(this.getActor().getX(), this.getActor().getY());
-				fireMovedEvent();
-	            return true;
-	          }
-	    };
-	    addAction(Actions.sequence(move, over));
-	}
-	public void moveBy(float x, float y, float duration) {
-		// Move towards a direction during given time (NON-STOP)
-		MoveByAction move = new MoveByAction();
-		move.setAmount(x, y);
-		if (duration > 0.0f) {
-			move.setDuration(duration);
-		}
-		Action over = new Action() {
-			@Override
-	          public boolean act(final float it) {
-				setPosition(this.getActor().getX(), this.getActor().getY());
-				fireMovedEvent();
-	            return true;
-	          }
-	    };
-	    addAction(Actions.sequence(move, over));
-	}
 	/**
 	 * Translate actor in a direction of speed without stopping. Actor moves in
 	 * constants speed set without acceleration
@@ -240,13 +198,4 @@ public class MapActor extends Actor {
 	public Animation getAnimation(){
 		return animation;
 	}
-	public void addListener(MovedListener ml){
-		movedListeners.add(ml);
-	}
-	public void fireMovedEvent(){
-		for(MovedListener ml: movedListeners)
-			ml.onMoved();
-	}
 }

{Stage → src/scene2d}/Net.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 /*
 import java.io.IOException;
 import java.io.InputStream;

src/scene2d/Scene.java ADDED Viewed

@@ -0,0 +1,921 @@
+package scene2d;
+import scene3d.Actor3d;
+import scene3d.Group3d;
+import scene3d.Stage3d;
+import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.InputMultiplexer;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.PerspectiveCamera;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Group;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.ArrayMap;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.Scaling;
+import com.badlogic.gdx.utils.StringBuilder;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+abstract public class Scene extends Group {
+	/* The array map containing all the scenes data of the game*/
+	public static final ArrayMap<String, String> scenesMap = new ArrayMap<String, String>();
+	private String sceneName = "";
+	public String sceneBackground = "None";
+	public String sceneMusic = "None";
+	public String sceneTransition = "None";
+	public float sceneDuration = 0;
+	public InterpolationType sceneInterpolationType = InterpolationType.Linear;
+	public static Color bgColor = new Color(1f,1f,1f,1f);
+	public static JsonValue configJson = null;
+	public static final JsonReader jsonReader = new JsonReader();
+	public static final Json json = new Json();
+	public static float splashDuration = 0f;
+	public static boolean pauseState = false;
+	/*Important:
+	 *  The Target Width  and Target Height refer to the nominal width and height of the game for the
+	 *  graphics which are created  for this width and height, this allows for the Stage to scale this
+	 *  graphics for all screen width and height. Therefore your game will work on all screen sizes
+	 *  but maybe blurred or look awkward on some devices.
+	 *  ex:
+	 *  My Game targetWidth = 800 targetHeight = 480
+	 *  Then my game works perfectly for SCREEN_WIDTH = 800 SCREEN_HEIGHT = 480
+	 *  and on others screen sizes it is just zoomed/scaled but works fine thats all
+	 */
+	public static float targetWidth = 800;
+	public static float targetHeight  = 480;
+	public static boolean debug = false;
+	public final static Vector2 mouse = new Vector2();
+	private static Scene currentScene = null;
+	private static int sceneIndex = 0;
+	public static ClassLoader cl = null;
+	public static com.badlogic.gdx.scenes.scene2d.Stage stage2d;
+	public static Stage3d stage3d;
+	private static Label fpsLabel;
+	private static InputMultiplexer inputMux;
+	public static int mousePointer = 0;
+	public static int mouseButton = 0;
+	public static boolean cullingEnabled = false;
+	public static boolean isDirty = false;
+	public static String basePackage = "source.";
+	public Scene(){
+		setTouchable(Touchable.childrenOnly);
+		Camera.reset();
+		stage2d.clear();
+		stage3d.clear();
+		stage2d.addListener(touchInput);
+		setSize(targetWidth, targetHeight);
+		setBounds(0,0, targetWidth, targetHeight);
+		setColor(1f, 1f, 1f, 1f);
+		setVisible(true);
+		stage2d.getRoot().setPosition(0, 0);
+		stage2d.getRoot().setVisible(true);
+		stage3d.getRoot().setPosition(0, 0, 0);
+		stage3d.getRoot().setVisible(true);
+		sceneName = this.getClass().getName();
+		setName(sceneName);
+		Scene.log("Current Scene: "+sceneName);
+		currentScene = this;
+		load(sceneName);
+		cullingEnabled = true;
+	}
+	@Override
+	public void act(float delta){
+		super.act(delta);
+		if (fpsLabel != null)
+			fpsLabel.setText("Fps: " + Gdx.graphics.getFramesPerSecond());
+	}
+	public abstract void onClick(Actor actor);
+	public abstract void onTouchDown(Actor actor);
+	public abstract void onTouchUp();
+	public abstract void onDragged();
+	public abstract void onGesture(GestureType gestureType);
+	public abstract void onKeyTyped(char key);
+	public abstract void onKeyUp(int keycode);
+	public abstract void onKeyDown(int keycode);
+	/*
+	 * This will pause any music and stop any sound being played
+	 * and will fire the Pause event
+	 */
+	public abstract void onPause();
+	/*
+	 * This will resume any music currently being played
+	 * and will fire the Resume event
+	 */
+	public abstract void onResume();
+	public abstract void onDispose();
+	public void load(String sceneName){
+		log("Load "+sceneName);
+		if(!sceneName.contains(basePackage) && !sceneName.contains("gdxstudio"))
+			sceneName = basePackage+sceneName;
+		String[] lines = scenesMap.get(sceneName).split("\n");
+		for(String line: lines){
+			if(line.trim().isEmpty())
+				continue;
+			json.fromJson(null, line);
+			//log(line);
+		}
+		if(!sceneBackground.equals("None"))
+			setBackground(sceneBackground);
+		if(!sceneMusic.equals("None"))
+			Asset.musicPlay(sceneMusic);
+		if(!sceneTransition.equals("None"))
+			Effect.createEffect(Scene.getRoot(), EffectType.valueOf(sceneTransition), 1f,
+					sceneDuration, sceneInterpolationType);
+	}
+	protected void save(){
+		save(sceneName);
+	}
+	public void save(String sceneName){
+		if(!isDirty)
+			return;
+		if(sceneName == null || sceneName.isEmpty())
+			return;
+		Scene.log("Save "+sceneName);
+		if(!sceneName.contains(basePackage) && !sceneName.contains("gdxstudio"))
+			sceneName = basePackage+sceneName;
+		StringBuilder sb = new StringBuilder();
+		for(Actor actor: getChildren()){
+			sb.append(json.toJson(actor));
+			sb.append("\n");
+		}
+		sb.append(json.toJson(getRoot().findActor(this.sceneName)));//??Warning
+		scenesMap.put(sceneName, sb.toString());
+		Gdx.files.local(Asset.basePath+"scene").writeString(json.toJson(scenesMap, ArrayMap.class,
+				String.class), false);
+		sb = null;
+		isDirty = false;
+	}
+	/**
+	 * Set the current scene to be displayed
+	 * @param className The scene's Class Name
+	 **/
+	public static void setScene(String className){
+		if(!className.contains(basePackage) && !className.contains("gdxstudio"))
+			className = basePackage+className;
+		if(!scenesMap.containsKey(className)){
+			log(className+": Scene Does not Exist");
+			return;
+		}
+		/*
+		 *  Every time the scene Changes disable panning/following/listening as it can cause the
+		 *  camera to move around aimlessly, thus abrupting the scene and clear
+		 *  all the listeners/huds that were registered in the previous scene
+		 */
+		sceneIndex = Scene.scenesMap.keys().toArray().indexOf(className, false);
+		if(currentScene != null)
+			currentScene.onDispose();
+		try {
+			if(cl != null)
+				cl.loadClass(className).newInstance();
+			else
+				Class.forName(className).newInstance();
+		} catch (InstantiationException e) {
+			log("Scene cannot be created , Check if scene class constructor is empty");
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			log("Scene cannot be created , Check if scene class can be found");
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			log("Scene cannot be created , Check if scene class can be found");
+			e.printStackTrace();
+		}
+		//if (fpsLabel != null && configJson.getBoolean("showFPS")){
+		//	fpsLabel.setPosition(targetWidth - 80, targetHeight - 20);
+		//	Camera.addHud(fpsLabel);
+		//}
+	}
+	/**
+	 * Set the current scene to be displayed with an amount of delay
+	 * @param className The registered scene's name
+	 **/
+	public static void setSceneWithDelay(final String className, float delay){
+		Timer.schedule(new Task(){
+			@Override
+			public void run() {
+				setScene(className);
+			}
+		}, delay);
+	}
+	/**
+	 * Returns the current scene being Displayed on stage
+	 **/
+	public static Scene getCurrentScene(){
+		return currentScene;
+	}
+	/**
+	 * Changes to the next scene in the scnesList
+	 **/
+	public static void nextScene(){
+		if(sceneIndex <= scenesMap.size)
+			sceneIndex++;
+		setScene(scenesMap.getKeyAt(sceneIndex));
+	}
+	/**
+	 * Changes to the previous scene in the scnesList
+	 **/
+	public static void prevScene(){
+		if(sceneIndex >= 0)
+			sceneIndex--;
+		setScene(scenesMap.getKeyAt(sceneIndex));
+	}
+	/**
+	 * Changes to the next scene in the scnesList
+	 **/
+	public static void nextSceneWithDelay(float delay){
+		if(sceneIndex <= scenesMap.size)
+			sceneIndex++;
+		setSceneWithDelay(Scene.scenesMap.getKeyAt(sceneIndex), delay);
+	}
+	/**
+	 * Changes to the previous scene in the scnesList
+	 **/
+	public static void prevSceneWithDelay(float delay){
+		if(sceneIndex >= 0)
+			sceneIndex--;
+		setSceneWithDelay(scenesMap.getKeyAt(sceneIndex), delay);
+	}
+	private static Image imgbg = null;
+	public void setBackground(String texName) {
+		if(imgbg != null)
+			removeBackground();
+		if(Asset.tex(texName) != null){
+			imgbg = new Image(new TextureRegionDrawable(Asset.tex(texName)), Scaling.stretch);
+			imgbg.setFillParent(true);
+			stage2d.addActor(imgbg);
+			imgbg.toBack();
+		}
+	}
+	public void removeBackground() {
+		getRoot().removeActor(imgbg);
+	}
+	public static Group getRoot(){
+		return stage2d.getRoot();
+	}
+	public void addActor(Actor actor, float x, float y){
+		if(actor != null){
+			actor.setPosition(x, y);
+			addActor(actor);
+		}
+	}
+	public void addActorWithDelay(final Actor actor, float delay){
+		Timer.schedule(new Task(){
+			@Override
+			public void run() {
+				addActor(actor);
+			}
+		}, delay);
+	}
+	public boolean removeActor(String actorName){
+		return removeActor(findActor(actorName));
+	}
+	public void removeActorWithDelay(Actor actor, float delay){
+		addAction(Actions.sequence(Actions.delay(delay), Actions.removeActor(actor)));
+	}
+	public Actor hit(float x, float y){
+		return hit(x, y, true);
+	}
+	/* Dragging Camera Related */
+	static boolean gestureStarted = false;
+	static Actor validActor = null;
+	private final ClickListener touchInput = new ClickListener(){
+		@Override
+		public void clicked(InputEvent event, float x, float y){
+			super.clicked(event, x, y);
+			mouse.set(x, y);
+			validActor = hit(x,y);
+			if(validActor != null && validActor.getName() != null)
+				Scene.getCurrentScene().onClick(validActor);
+		}
+		@Override
+		public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
+			mouse.set(x, y);
+			mousePointer = pointer;
+			mouseButton = button;
+			touchInitialX = x;
+			touchInitialY = y;
+			gestureStarted = true;
+			validActor = hit(x,y);
+			if(validActor != null && validActor.getName() != null)
+				Scene.getCurrentScene().onTouchDown(validActor);
+			return super.touchDown(event, x, y, pointer, button);
+		}
+		@Override
+		public void touchDragged(InputEvent event, float x, float y, int pointer){
+			super.touchDragged(event, x, y, pointer);
+			mouse.set(x, y);
+			mousePointer = pointer;
+			Scene.getCurrentScene().onDragged();
+			if(gestureStarted == true){
+				touchCurrentX = x;
+				touchCurrentY = y;
+				if(getGestureDirection() != GestureType.None){
+					gestureStarted = false;
+					Scene.getCurrentScene().onGesture(getGestureDirection());
+				}
+			}
+			if(Camera.useDrag)
+				Camera.dragCam((int)x, (int)-y);
+		}
+		@Override
+		public void touchUp(InputEvent event, float x, float y, int pointer, int button){
+			super.touchUp(event, x, y, pointer, button);
+			mouse.set(x, y);
+			mousePointer = pointer;
+			mouseButton = button;
+			// reset Gesture
+			difX = 0.0f;
+			difY = 0.0f;
+			touchInitialX = 0.0f;
+			touchInitialY = 0.0f;
+			touchCurrentX = 0.0f;
+			touchCurrentY = 0.0f;
+			touchDifX = 0.0f;
+			touchDifY = 0.0f;
+			prevDifX = 0.0f;
+			prevDifY = 0.0f;
+			// reset Gesture
+			Scene.getCurrentScene().onTouchUp();
+			Camera.resetDrag();
+			gestureStarted = false;
+		}
+		@Override
+		public boolean keyTyped(InputEvent event, char key) {
+			Scene.getCurrentScene().onKeyTyped(key);
+			return super.keyUp(event, key);
+		}
+		@Override
+		public boolean keyUp(InputEvent event, int keycode) {
+			Scene.getCurrentScene().onKeyUp(keycode);
+			return super.keyUp(event, keycode);
+		}
+		@Override
+		public boolean keyDown(InputEvent event, int keycode) {
+			Scene.getCurrentScene().onKeyDown(keycode);
+			return super.keyDown(event, keycode);
+		}
+	};
+	/*
+	 * Gesture related
+	 */
+	public static float touchDragIntervalRange = 200f; // 200px drag for a gesture event
+	public static float touchInitialX = 0.0f, touchInitialY = 0.0f;
+	public static float touchCurrentX = 0.0f, touchCurrentY = 0.0f;
+	public static float difX;
+	public static float difY;
+	public static float prevDifX;
+	public static float prevDifY;
+	public static float touchDifX;
+	public static float touchDifY;
+	public boolean isTouchDragInterval() {
+		difX = java.lang.Math.abs(touchInitialX - touchCurrentX);
+		difY = java.lang.Math.abs(touchInitialY - touchCurrentY);
+		if (difX > touchDragIntervalRange || difY > touchDragIntervalRange)
+			return true;
+		else
+			return false;
+	}
+	public static GestureType getGestureDirection() {
+		prevDifX = difX;
+		prevDifY = difY;
+		difX = java.lang.Math.abs(touchInitialX - touchCurrentX);
+		difY = java.lang.Math.abs(touchInitialY - touchCurrentY);
+		/**
+		 * Get minimal changes on drag
+		 * <p> checkMomentumChanges
+		 * EXAMPLE<br>
+		 * User drags finger to left, suddenly dragging to right without removing
+		 * his finger from the screen
+		 * */
+		if (prevDifX > difX || prevDifY > difY) {
+			touchInitialX = touchCurrentX;
+			touchInitialY = touchCurrentY;
+			//
+			difX = 0.0f;
+			difY = 0.0f;
+			prevDifX = 0.0f;
+			prevDifY = 0.0f;
+			/**
+			 * Set touch differences, optional, if you need amount of change from
+			 * initial touch to drag, USE THIS: on touchDrag, pan or similar mthods
+			 * */
+			touchDifX = java.lang.Math.abs(touchInitialX - touchCurrentX);
+			touchDifY = java.lang.Math.abs(touchInitialY - touchCurrentY);
+		}
+		if (touchInitialY < touchCurrentY && difY > difX) {
+			return GestureType.Up;
+		} else if (touchInitialY > touchCurrentY && difY > difX) {
+			return GestureType.Down;
+		} else if (touchInitialX < touchCurrentX && difY < difX) {
+			return GestureType.Right;
+		} else if (touchInitialX > touchCurrentX && difY < difX) {
+			return GestureType.Left;
+		} else {
+			return GestureType.None;
+		}
+	}
+	/*
+	 * Dialog Methods
+	 */
+	public void showToast(String message, float duration){
+		Table table = new Table(Asset.skin);
+		table.add("   "+message+"   ");
+		table.setBackground(Asset.skin.getDrawable("dialogDim"));
+		table.pack();
+		table.setPosition(Scene.targetWidth/2 - table.getWidth(), Scene.targetHeight/2 - table.getHeight());
+		addActor(table);
+		table.addAction(Actions.sequence(Actions.delay(duration), Actions.removeActor(table)));
+	}
+	public void showMessageDialog(String title, String message){
+		Dialog dialog = new Dialog(title, Asset.skin);
+		dialog.getContentTable().add(message);
+		dialog.button("OK", "OK");
+		dialog.pack();
+		dialog.show(getStage());
+	}
+	public boolean showConfirmDialog(String title, String message){
+		Dialog dialog = new Dialog(title, Asset.skin);
+		dialog.button("Yes", "Yes");
+		dialog.button("No", "No");
+		dialog.pack();
+		dialog.show(getStage());
+		//if(dialog.result().equals("Yes")) FIXME update Gdx
+		//	return true;
+		return false;
+	}
+	public void outline(Actor actor){
+		selectionBox.setPosition(actor.getX(), actor.getY());
+		selectionBox.setSize(actor.getWidth(), actor.getHeight());
+		stage2d.addActor(selectionBox);
+	}
+/***********************************************************************************************************
+* 					3d Related Functions												   	       		   *
+************************************************************************************************************/
+	public static void addActor3d(Actor3d actor3d){
+		stage3d.addActor3d(actor3d);
+	}
+	public static void removeActor3d(Actor3d actor3d){
+		stage3d.getRoot().removeActor3d(actor3d);
+	}
+	public static void removeActor3d(String actor3dName){
+		getRoot3d().removeActor3d(stage3d.getRoot().findActor(actor3dName));
+	}
+	public static Group3d getRoot3d(){
+		return stage3d.getRoot();
+	}
+	public static void getChildren3d(){
+		stage3d.getActors3d();
+	}
+	public static void resetCamera3d(){
+		stage3d.getCamera().position.set(10f, 10f, 10f);
+		stage3d.getCamera().lookAt(0,0,0);
+		stage3d.getCamera().near = 0.1f;
+		stage3d.getCamera().far = 300f;
+	}
+	public static PerspectiveCamera getCamera3d(){
+		return stage3d.getCamera();
+	}
+	public static void log(String log) {
+		if(Scene.configJson.getBoolean("loggingEnabled"))
+			Gdx.app.log("Stage ", log);
+	}
+/***********************************************************************************************************
+* 					Utilities Related Functions												   	       		   *
+************************************************************************************************************/
+	/*
+	 * The the angle in degrees of the inclination of a line
+	 * @param cx, cy The center point x, y
+	 * @param tx, ty The target point x, y
+	 */
+	public static float getAngle(float cx, float cy, float tx, float ty) {
+		float angle = (float) Math.toDegrees(MathUtils.atan2(tx - cx, ty - cy));
+		//if(angle < 0){
+		//    angle += 360;
+		//}
+		return angle;
+	}
+	private static Vector2 distVector = new Vector2();
+	public static final float getDistance(Actor a, Actor b){
+		distVector.set(a.getX(), a.getY());
+		return distVector.dst(b.getX(), b.getY());
+	}
+	public static final float getDistance(float x1, float y1, float x2, float y2){
+		distVector.set(x1, y1);
+		return distVector.dst(x2, y2);
+	}
+	/*
+	 * Capitalizes the First Letter of a String
+	 */
+	public static String capitalize(String text){
+		if(text != null && text != "")
+			return (text.substring(0, 1)).toUpperCase() + text.substring(1);
+		else
+			return "";
+	}
+	/*
+	 * UnCapitalizes the First Letter of a String
+	 */
+	public static String uncapitalize(String text){
+		return text.substring(0, 1).toLowerCase()+text.substring(1);
+	}
+	public static Rectangle getBounds(Actor actor) {
+		float posX = actor.getX();
+		float posY = actor.getY();
+		float width = actor.getWidth();
+		float height = actor.getHeight();
+		return new Rectangle(posX, posY, width, height);
+	}
+	public static boolean collides(Actor actor, float x, float y) {
+		Rectangle rectA1 = getBounds(actor);
+		Rectangle rectA2 = new Rectangle(x, y, 5, 5);
+		// Check if rectangles collides
+		if (Intersector.overlaps(rectA1, rectA2)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	public static boolean collides(Actor actor1, Actor actor2) {
+		Rectangle rectA1 = getBounds(actor1);
+		Rectangle rectA2 = getBounds(actor2);
+		// Check if rectangles collides
+		if (Intersector.overlaps(rectA1, rectA2)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	/**
+	 * Get screen time from start in format of HH:MM:SS. It is calculated from
+	 * "secondsTime" parameter.
+	 * */
+	public static String toScreenTime(float secondstime) {
+		int seconds = (int)(secondstime % 60);
+		int minutes = (int)((secondstime / 60) % 60);
+		int hours =  (int)((secondstime / 3600) % 24);
+		return new String(addZero(hours) + ":" + addZero(minutes) + ":" + addZero(seconds));
+	}
+	private static String addZero(int value){
+		String str = "";
+		if(value < 10)
+			 str = "0" + value;
+		else
+			str = "" + value;
+		return str;
+	}
+	/*
+	 * TEA Encryption and Decryption
+	 */
+	public static String encryptKey = "Default";
+	private static final int encryptDelta = 0x9E3779B9;
+	private static final int MX(int sum, int y, int z, int p, int e, int[] k) {
+		return (z >>> 5 ^ y << 2) + (y >>> 3 ^ z << 4) ^ (sum ^ y) + (k[p & 3 ^ e] ^ z);
+	}
+	public static final byte[] encrypt(String data) {
+		return encrypt(data.getBytes(), encryptKey.getBytes());
+	}
+	public static final byte[] decrypt(String data) {
+		return decrypt(data.getBytes(), encryptKey.getBytes());
+	}
+	public static final byte[] encrypt(String data, String key) {
+		return encrypt(data.getBytes(), key.getBytes());
+	}
+	public static final byte[] decrypt(String data, String key) {
+		return decrypt(data.getBytes(), key.getBytes());
+	}
+	private static final byte[] encrypt(byte[] data, byte[] key) {
+		if (data.length == 0)
+			return data;
+		return toByteArray(encrypt(toIntArray(data, true), toIntArray(key, false)), false);
+	}
+	private static final byte[] decrypt(byte[] data, byte[] key) {
+		if (data.length == 0)
+			return data;
+		return toByteArray(decrypt(toIntArray(data, false), toIntArray(key, false)), true);
+	}
+	private static final int[] encrypt(int[] v, int[] k) {
+		int n = v.length - 1;
+		if (n < 1) {
+			return v;
+		}
+		if (k.length < 4) {
+			int[] key = new int[4];
+			System.arraycopy(k, 0, key, 0, k.length);
+			k = key;
+		}
+		int z = v[n], y = v[0], sum = 0, e;
+		int p, q = 6 + 52 / (n + 1);
+		while (q-- > 0) {
+			sum = sum + encryptDelta;
+			e = sum >>> 2 & 3;
+	for (p = 0; p < n; p++) {
+		y = v[p + 1];
+		z = v[p] += MX(sum, y, z, p, e, k);
+	}
+	y = v[0];
+	z = v[n] += MX(sum, y, z, p, e, k);
+		}
+		return v;
+	}
+	private static final int[] decrypt(int[] v, int[] k) {
+		int n = v.length - 1;
+		if (n < 1) {
+			return v;
+		}
+		if (k.length < 4) {
+			int[] key = new int[4];
+			System.arraycopy(k, 0, key, 0, k.length);
+			k = key;
+		}
+		int z = v[n], y = v[0], sum, e;
+		int p, q = 6 + 52 / (n + 1);
+		sum = q * encryptDelta;
+		while (sum != 0) {
+			e = sum >>> 2 & 3;
+		for (p = n; p > 0; p--) {
+			z = v[p - 1];
+			y = v[p] -= MX(sum, y, z, p, e, k);
+		}
+		z = v[n];
+		y = v[0] -= MX(sum, y, z, p, e, k);
+		sum = sum - encryptDelta;
+		}
+		return v;
+	}
+	private static final int[] toIntArray(byte[] data, boolean includeLength) {
+		int n = (((data.length & 3) == 0)
+				? (data.length >>> 2)
+						: ((data.length >>> 2) + 1));
+		int[] result;
+		if (includeLength) {
+			result = new int[n + 1];
+			result[n] = data.length;
+		}
+		else {
+			result = new int[n];
+		}
+		n = data.length;
+		for (int i = 0; i < n; i++) {
+			result[i >>> 2] |= (0x000000ff & data[i]) << ((i & 3) << 3);
+		}
+		return result;
+	}
+	private static final byte[] toByteArray(int[] data, boolean includeLength) {
+		int n = data.length << 2;
+		if (includeLength) {
+			int m = data[data.length - 1];
+			if (m > n) {
+				return null;
+			}
+			else {
+				n = m;
+			}
+		}
+		byte[] result = new byte[n];
+		for (int i = 0; i < n; i++) {
+			result[i] = (byte) ((data[i >>> 2] >>> ((i & 3) << 3)) & 0xff);
+		}
+		return result;
+	}
+	private static ShapeRenderer shapeRenderer;
+	private final static Actor selectionBox = new Actor(){
+		@Override
+		public void draw(Batch batch, float alpha){
+			batch.end();
+			shapeRenderer.begin(ShapeType.Line);
+			shapeRenderer.setColor(Color.GREEN);
+			shapeRenderer.rect(getX(), getY(),
+						getWidth(),getHeight());
+			shapeRenderer.end();
+			batch.begin();
+		}
+	};
+	static void setupFps(){
+		fpsLabel = new Label("", Asset.skin);
+		fpsLabel.setName("Fps");
+	}
+	public static float stateTime = 0;
+	public static float gameUptime = 0;
+	private static float startTime = System.nanoTime();
+	/*
+	 *  The main application listener for the game
+	 */
+	public static ApplicationListener app = new ApplicationListener() {
+		public int dots = 40;
+		public int xlines;
+		public int ylines;
+		@Override
+		public final void create() {
+			log("Create");
+			Config.setup();
+			Serializer.setup();
+			stage2d = new com.badlogic.gdx.scenes.scene2d.Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(),
+					Scene.configJson.getBoolean("keepAspectRatio"));
+			stage2d.getRoot().setName("Root");
+			stage2d.getRoot().setTouchable(Touchable.childrenOnly);
+			stage2d.setCamera(new Camera());
+			inputMux = new InputMultiplexer();
+			inputMux.addProcessor(stage2d);
+			stage3d = new Stage3d();
+			//camController = new CameraInputController(stage3d.getCamera());
+			//inputMux.addProcessor(stage3d);
+			//inputMux.addProcessor(camController);
+			shapeRenderer = new ShapeRenderer();
+			selectionBox.setTouchable(Touchable.disabled);
+			selectionBox.setName("Shape");
+			JsonValue sv = Scene.jsonReader.parse(Gdx.files.internal(Asset.basePath+"scene"));
+			for(JsonValue jv: sv.iterator())
+				scenesMap.put(jv.name, jv.asString());
+			setScene(scenesMap.firstKey());
+			Gdx.input.setCatchBackKey(true);
+			Gdx.input.setCatchMenuKey(true);
+			Gdx.input.setInputProcessor(inputMux);
+			xlines = (int)Gdx.graphics.getWidth()/dots;
+	 		ylines = (int)Gdx.graphics.getHeight()/dots;
+		}
+		/*
+		 * This is the main rendering call that updates the time, updates the stage,
+		 * loads assets asynchronously, updates the camera and FPS text.
+		 */
+		@Override
+		public final void render(){
+			Gdx.gl.glClearColor(bgColor.r, bgColor.g, bgColor.b, bgColor.a);
+			Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT |GL20.GL_DEPTH_BUFFER_BIT);
+			if (System.nanoTime() - startTime >= 1000000000) {
+				gameUptime +=1 ;
+				startTime = System.nanoTime();
+			}
+			stateTime += Gdx.graphics.getDeltaTime();
+			Asset.load();
+			stage3d.act();
+			stage3d.draw();
+		    //camController.update();
+			Scene.stage2d.act();//Gdx.graphics.getDeltaTime();
+			Scene.stage2d.draw();
+			if(debug){
+				shapeRenderer.begin(ShapeType.Point);
+				shapeRenderer.setColor(Color.BLACK);
+				for(int i = 0; i<=xlines; i++)
+					for(int j = 0; j<=ylines; j++)
+						shapeRenderer.point(2+i*dots, j*dots, 0);
+				shapeRenderer.end();
+			}
+	 	}
+		@Override
+		public final void resize(int width, int height) {
+			log("Resize");
+			stage2d.setViewport(targetWidth, targetHeight, configJson.getBoolean("keepAspectRatio"));
+			stage3d.setViewport(targetWidth, targetHeight, configJson.getBoolean("keepAspectRatio"));
+		}
+		@Override
+		public final void pause() {
+			log("Pause");
+			Asset.musicPause();
+			Asset.soundStop();
+			Scene.pauseState = true;
+			Scene.getCurrentScene().onPause();
+		}
+		@Override
+		public final void resume() {
+			log("Resume");
+			Asset.musicResume();
+			Scene.pauseState = false;
+			Scene.getCurrentScene().onResume();
+		}
+		@Override
+		public final void dispose() {
+			log("Dispose");
+			Scene.getCurrentScene().onDispose();
+			Scene.stage2d.dispose();
+			Asset.unloadAll();
+			Gdx.app.exit();
+		}
+	};
+	public static final void exit(){
+		log("Disposing and Exiting");
+		getCurrentScene().onDispose();
+		stage2d.dispose();
+		stage3d.dispose();
+		Asset.unloadAll();
+		Gdx.app.exit();
+	}
+	public enum GestureType {
+		None, Up, Down, Left, Right
+	}
+	public enum OnEventType {
+		DoEffect,
+		SetScene
+	}
+}

{Stage → src/scene2d}/Serializer.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
@@ -26,11 +27,11 @@ import com.badlogic.gdx.utils.JsonValue;
 public class Serializer {
-	public static void registerSerializer(Class clazz, Json.Serializer serializer){
+	public static void registerSerializer(Class<?> clazz, Json.Serializer serializer){
-		Stage.json.setSerializer(clazz, serializer);
+		Scene.json.setSerializer(clazz, serializer);
 	}
-	public static void initialize(){
+	public static void setup(){
 		registerSerializer(Actor.class, new ActorSerializer());
 		registerSerializer(Scene.class, new SceneSerializer());
 		registerSerializer(ImageJson.class, new ImageJson());
@@ -82,10 +83,11 @@ public class Serializer {
 			actor.setOriginX(jv.getFloat("ox"));
 			actor.setOriginY(jv.getFloat("oy"));
 			actor.setRotation(jv.getFloat("rotation"));
-			//actor.setZIndex(jv.getInt("zindex"));
 			actor.setColor(Color.valueOf(jv.getString("color")));
 			actor.setTouchable(Touchable.valueOf(jv.getString("touchable")));
 			actor.setVisible(jv.getBoolean("visible"));
+			Scene.getCurrentScene().addActor(actor);
+			actor.setZIndex(jv.getInt("zindex"));
 		}
 		public static void writeActor(Json json, Actor actor){
@@ -109,12 +111,14 @@ public class Serializer {
 	public static class SceneSerializer extends ActorSerializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
-			Scene scene = Stage.getScene();
+			Scene scene = Scene.getCurrentScene();
 			scene.sceneBackground = jv.getString("background");
 			scene.sceneMusic = jv.getString("music");
 			scene.sceneTransition = jv.getString("transition");
 			scene.sceneDuration = jv.getFloat("duration");
 			scene.sceneInterpolationType = InterpolationType.valueOf(jv.getString("interpolation"));
+			Scene.log(Scene.getCurrentScene().getName());
+			Scene.getRoot().addActor(scene);
 			return scene;
 		}
@@ -122,7 +126,7 @@ public class Serializer {
 		public void write(Json json, Actor label, Class arg2) {
 			json.writeObjectStart();
 			Scene scene = (Scene) label;
-			json.writeValue("class", "Scene");
+			json.writeValue("class", Scene.class.getName());
 			json.writeValue("background", scene.sceneBackground);
 			json.writeValue("music", scene.sceneMusic);
 			json.writeValue("transition", scene.sceneTransition);
@@ -176,14 +180,14 @@ public class Serializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
 			CheckBox check = new CheckBox(jv.getString("text"), Asset.skin);
-			ActorSerializer.readActor(jv, check);
+			readActor(jv, check);
 			return check;
 		}
 		@Override
 		public void write(Json json, Actor check, Class arg2) {
 			json.writeObjectStart();
-			ActorSerializer.writeActor(json, check);
+			writeActor(json, check);
 			json.writeValue("text", ((CheckBox)check).getText().toString());
 			json.writeObjectEnd();
 		}
@@ -240,14 +244,14 @@ public class Serializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
 			List list = new List(jv.getString("text").split(","), Asset.skin);
-			ActorSerializer.readActor(jv, list);
+			readActor(jv, list);
 			return list;
 		}
 		@Override
 		public void write(Json json, Actor list, Class arg2) {
 			json.writeObjectStart();
-			ActorSerializer.writeActor(json, list);
+			writeActor(json, list);
 			String items = "";
 			for(String s: ((List)list).getItems())
 				items+=s+",";
@@ -263,14 +267,14 @@ public class Serializer {
 		public Actor read(Json json, JsonValue jv, Class arg2) {
 			Touchpad tp = new Touchpad(jv.getFloat("deadzoneRadius"), Asset.skin);
 			deadZoneRadius = jv.getFloat("deadzoneRadius");
-			ActorSerializer.readActor(jv, tp);
+			readActor(jv, tp);
 			return tp;
 		}
 		@Override
 		public void write(Json json, Actor tp, Class arg2) {
 			json.writeObjectStart();
-			ActorSerializer.writeActor(json, tp);
+			writeActor(json, tp);
 			json.writeValue("deadzoneRadius", deadZoneRadius);
 			json.writeObjectEnd();
 		}
@@ -326,9 +330,10 @@ public class Serializer {
 			else{
 				sprite = new Sprite(jv.getFloat("duration"), jv.getString("textures").split(","));
 			}
-			ActorSerializer.readActor(jv, sprite);
 			sprite.isAnimationActive = jv.getBoolean("active");
 			sprite.isAnimationLooping = jv.getBoolean("looping");
+			ActorSerializer.readActor(jv, sprite);
 			return sprite;
 		}
@@ -393,10 +398,10 @@ public class Serializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
 			Dialog dialog = new Dialog(jv.getString("title"), Asset.skin);
-			readActor(jv, dialog);
 			dialog.setModal(jv.getBoolean("modal"));
 			dialog.setMovable(jv.getBoolean("move"));
 			dialog.setResizable(jv.getBoolean("resize"));
+			readActor(jv, dialog);
 			return dialog;
 		}

{Stage → src/scene2d}/Sprite.java RENAMED Viewed

@@ -1,3 +1,4 @@
+package scene2d;
 import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -40,7 +41,7 @@ public class Sprite extends Actor {
 	public void draw(Batch batch, float parentAlpha) {
 		super.draw(batch, parentAlpha);
 		if (isAnimationActive && animation != null) {
-			keyFrame = animation.getKeyFrame(Stage.stateTime, isAnimationLooping);
+			keyFrame = animation.getKeyFrame(Scene.stateTime, isAnimationLooping);
 			batch.draw(keyFrame, getX(), getY(), getOriginX(), getOriginY(), getWidth(), getHeight(),
 					getScaleX(), getScaleY(), getRotation());
 		}

Stage/MainActivity.java → src/scene2d/android/Main.java RENAMED Viewed

@@ -1,23 +1,25 @@
+package scene2d.android;
+import scene2d.Scene;
 import android.os.Bundle;
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-public class MainActivity extends AndroidApplication {
+public class Main extends AndroidApplication {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-		Stage.configJson = Stage.jsonReader.parse(this.getClass().getClassLoader().getResourceAsStream("config"));
+		Scene.configJson = Scene.jsonReader.parse(this.getClass().getClassLoader().getResourceAsStream("config"));
-		String[] target = Stage.configJson.getString("targetSize").split("x");
+		String[] target = Scene.configJson.getString("targetSize").split("x");
-		Stage.targetWidth = Integer.parseInt(target[0]);
+		Scene.targetWidth = Integer.parseInt(target[0]);
-		Stage.targetHeight = Integer.parseInt(target[1]);
+		Scene.targetHeight = Integer.parseInt(target[1]);
         AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
         cfg.useAccelerometer = false;
-        cfg.useGL20 = Stage.configJson.getBoolean("useGL20");
+        cfg.useGL20 = Scene.configJson.getBoolean("useGL20");
         cfg.useCompass = false;
         cfg.hideStatusBar = true;
         cfg.useWakelock =  true;
-        initialize(Stage.getInstance(), cfg);
+        initialize(Scene.app, cfg);
     }
 }

src/scene2d/desktop/Main.java ADDED Viewed

@@ -0,0 +1,38 @@
+package scene2d.desktop;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import scene2d.Scene;
+import com.badlogic.gdx.Files.FileType;
+import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
+import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+public class Main {
+		public static void main(String[] argc) {
+			final LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
+			Scene.configJson = Scene.jsonReader.parse(Main.class.getClassLoader().getResourceAsStream("config"));
+			if(Scene.configJson.getBoolean("hasIcon"))
+				cfg.addIcon("icon.png", FileType.Internal);
+			String[] screen = Scene.configJson.getString("screenSize").split("x");
+			String[] target = Scene.configJson.getString("targetSize").split("x");
+			cfg.width = Integer.parseInt(screen[0]);
+			cfg.height = Integer.parseInt(screen[1]);
+			Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize();
+			cfg.x = (int) ((dimension.getWidth() - cfg.width) / 2);
+			cfg.y = (int) ((dimension.getHeight() - cfg.height) / 2);
+			cfg.resizable = Scene.configJson.getBoolean("resize");
+			cfg.forceExit =  Scene.configJson.getBoolean("forceExit");
+			cfg.fullscreen =  Scene.configJson.getBoolean("fullScreen");
+			cfg.useGL20 = Scene.configJson.getBoolean("useGL20");
+			cfg.vSyncEnabled = Scene.configJson.getBoolean("vSync");
+			cfg.audioDeviceBufferCount = Scene.configJson.getInt("audioBufferCount");
+			LwjglApplicationConfiguration.disableAudio = Scene.configJson.getBoolean("disableAudio");
+			Scene.targetWidth = Integer.parseInt(target[0]);
+			Scene.targetHeight = Integer.parseInt(target[1]);
+			new LwjglApplication(Scene.app, cfg);
+		}
+}

test/config CHANGED Viewed

@@ -1,16 +1,16 @@
 {
 title: Game1,
-version: "0.45",
+version: "0.5.5",
 hasIcon: true,
 targetSize: "800x480",
-screenSize: "800x480",
+screenSize: "852x480",
 audioBufferCount: "10",
-resize: "false",
+resize: "true",
 forceExit: "false",
 fullScreen: "false",
 useGL20: "false",
-vSync: "false",
+vSync: "true",
-disableAudio: "false",
+disableAudio: "true",
 keepAspectRatio: "false",
 showFPS: "true",
 loggingEnabled: "true",

test/scene CHANGED Viewed

@@ -1,57 +1,53 @@
-{Splash:"{class:Scene,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Bounce}
-",Menu:"{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play,x:286.79245,y:402,width:199.86148,height:84,ox:0,oy:0,rotation:0,zindex:1,color:ffccccff,touchable:enabled,visible:true,text:Play,fontName:font2}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Exit,x:305.66037,y:84.999985,width:159,height:84,ox:0,oy:0,rotation:0,zindex:2,color:\"000000ff\",touchable:enabled,visible:true,text:Exit,fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Options,x:221.69812,y:257,width:329,height:73,ox:0,oy:0,rotation:0,zindex:3,color:ccccffff,touchable:enabled,visible:true,text:Options,fontName:font2}
-{class:ImageJson,name:Image1,x:1103.2814,y:82,width:60,height:68.125,ox:30,oy:30,rotation:30,zindex:4,color:ffffffff,touchable:enabled,visible:true,texName:porgarett,effect:PatrolX,value:50,duration:0.7,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:None}
-{class:ImageJson,name:ImageJson3,x:486.79248,y:403,width:325,height:60,ox:0,oy:0,rotation:0,zindex:5,color:ffffffff,touchable:enabled,visible:true,texName:anim_green_santa,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:Clicked,onEvent:SetScene,eventScene:Options}
-{class:ImageJson,name:ImageJson5,x:583.9623,y:329,width:40,height:40,ox:0,oy:0,rotation:0,zindex:6,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson6,x:209.43396,y:11,width:325,height:60,ox:0,oy:0,rotation:0,zindex:7,color:ffffffff,touchable:enabled,visible:true,texName:anim_black_ghost,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson7,x:624.5283,y:196,width:40,height:40,ox:0,oy:0,rotation:0,zindex:8,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson8,x:564.15094,y:9828.126,width:40,height:40,ox:0,oy:0,rotation:0,zindex:9,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:PatrolY,value:600,duration:4,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson4,x:607.84314,y:263,width:40,height:40,ox:0,oy:0,rotation:0,zindex:10,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label3,x:287.73584,y:154,width:180,height:84,ox:0,oy:0,rotation:0,zindex:11,color:\"0707beff\",touchable:enabled,visible:true,text:Help,fontName:font1}
-{class:Sprite,name:Sprite1,x:40,y:236,width:60,height:60,ox:0,oy:0,rotation:0,zindex:12,color:ffffffff,touchable:enabled,visible:true,textures:\"porgarett,portiberon\",duration:0.5,active:true,looping:true,frameCount:1}
-{class:ImageJson,name:ImageJson2,x:NaN,y:NaN,width:125,height:146,ox:0,oy:0,rotation:0,zindex:13,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play3d,x:244.33963,y:336,width:307,height:67,ox:0,oy:0,rotation:0,zindex:14,color:ffcc00ff,touchable:enabled,visible:true,text:Play3d,fontName:font1}
-{class:Scene,background:img_obj_soil_1_,music:None,transition:rightToLeft,duration:1,interpolation:Circle}
-",Options:"{class:ImageJson,name:Image1,x:57.54715,y:308,width:58.013855,height:69,ox:0,oy:0,rotation:0,zindex:1,color:ffffffff,touchable:enabled,visible:true,texName:porgarett,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.SelectBox,name:SelectBox1,x:618.62744,y:66,width:76,height:33,ox:0,oy:0,rotation:0,zindex:2,color:ffffffff,touchable:enabled,visible:true,text:\"First,Second,Third,Next,Next,\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.List,name:List1,x:583.3334,y:209,width:100,height:100,ox:0,oy:0,rotation:0,zindex:3,color:ffffffff,touchable:enabled,visible:true,text:\"Menu,Options,Exit,\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox1,x:599.213,y:448,width:58,height:25,ox:0,oy:0,rotation:0,zindex:4,color:ffffffff,touchable:enabled,visible:true,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox2,x:596.836,y:407.62714,width:58,height:25,ox:0,oy:0,rotation:0,zindex:5,color:ffffffff,touchable:enabled,visible:true,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox3,x:598.82214,y:368.56702,width:58,height:25,ox:0,oy:0,rotation:0,zindex:6,color:ffffffff,touchable:enabled,visible:true,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox4,x:595.84296,y:330.50848,width:58,height:25,ox:0,oy:0,rotation:0,zindex:7,color:ffffffff,touchable:enabled,visible:true,text:Check}
-{class:ImageJson,name:Image2,x:57.54715,y:394,width:60,height:60,ox:0,oy:0,rotation:0,zindex:8,color:ffffffff,touchable:enabled,visible:true,texName:poralfador,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.TextButton,name:TextButton2,x:457.80597,y:404.6225,width:87,height:27,ox:0,oy:0,rotation:0,zindex:9,color:ffffffff,touchable:enabled,visible:true,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.TextButton,name:TextButton3,x:455.87964,y:363,width:87,height:27,ox:0,oy:0,rotation:0,zindex:10,color:ffffffff,touchable:enabled,visible:true,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.TextButton,name:TextButton4,x:452.83017,y:316,width:87,height:27,ox:0,oy:0,rotation:0,zindex:11,color:\"00ff00ff\",touchable:enabled,visible:true,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:300.9434,y:313,width:107.94458,height:51,ox:0,oy:0,rotation:0,zindex:12,color:ffffffff,touchable:enabled,visible:true}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button2,x:306.60376,y:370,width:101.986176,height:63,ox:0,oy:0,rotation:0,zindex:13,color:ff0000ff,touchable:enabled,visible:true}
-{class:com.badlogic.gdx.scenes.scene2d.ui.List,name:List2,x:698.12933,y:218,width:88.77136,height:100,ox:0,oy:0,rotation:0,zindex:14,color:ffffffff,touchable:enabled,visible:true,text:\"First,New,Third,Options,\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Touchpad,name:Touchpad1,x:8.937653,y:21,width:200,height:200,ox:0,oy:0,rotation:0,zindex:15,color:ffffffff,touchable:enabled,visible:true,deadzoneRadius:5}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Back,x:320.7547,y:23,width:180,height:84,ox:0,oy:0,rotation:0,zindex:16,color:ffffffff,touchable:enabled,visible:true,text:Back,fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button3,x:625.4902,y:154,width:50,height:50,ox:0,oy:0,rotation:0,zindex:17,color:ffffffff,touchable:enabled,visible:true}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Dialog,name:Dialog1,x:308.49057,y:105,width:150,height:150,ox:0,oy:0,rotation:0,zindex:18,color:ffffffff,touchable:enabled,visible:true,title:Title,modal:false,move:true,resize:false}
-{class:Scene,background:img_bg_1_,music:None,transition:upToDown,duration:1,interpolation:Circle}
-",Game:"{class:Scene,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Exp10In}
-{class:ImageJson,name:Player,x:131.13208,y:280,width:60,height:60,ox:0,oy:0,rotation:0,zindex:0,color:ffffffff,touchable:enabled,visible:true,texName:baldarov00,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{source.Splash:"{class:scene2d.Scene,background:None,music:None,transition:None,duration:1,interpolation:Linear}",source.Menu:"{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play,x:286.79245,y:402,width:199.86148,height:84,ox:0,oy:0,rotation:0,zindex:0,color:ffccccff,touchable:enabled,visible:true,text:Play,fontName:font2}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Exit,x:292,y:88,width:159,height:84,ox:0,oy:0,rotation:0,zindex:1,color:\"000000ff\",touchable:enabled,visible:true,text:Exit,fontName:font1}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Options,x:224,y:249,width:329,height:73,ox:0,oy:0,rotation:0,zindex:2,color:ccccffff,touchable:enabled,visible:true,text:Options,fontName:font2}
+{class:scene2d.ImageJson,name:scene2d.ImageJson3,x:488,y:412,width:325,height:60,ox:0,oy:0,rotation:0,zindex:3,color:ffffffff,touchable:enabled,visible:true,texName:anim_green_santa,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:Clicked,onEvent:SetScene,eventScene:Options}
+{class:scene2d.ImageJson,name:scene2d.ImageJson5,x:668,y:354,width:40,height:40,ox:0,oy:0,rotation:16.657846,zindex:4,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson6,x:213.00002,y:11,width:325,height:60,ox:0,oy:0,rotation:0,zindex:5,color:ffffffff,touchable:enabled,visible:true,texName:anim_black_ghost,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson7,x:659,y:269,width:40,height:40,ox:0,oy:0,rotation:0,zindex:6,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson8,x:564.15094,y:15621.421,width:40,height:40,ox:0,oy:0,rotation:0,zindex:7,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:PatrolY,value:600,duration:4,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson4,x:659,y:320,width:40,height:40,ox:0,oy:0,rotation:0,zindex:8,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label3,x:286,y:164,width:180,height:80,ox:0,oy:0,rotation:0,zindex:9,color:\"0707beff\",touchable:enabled,visible:true,text:Help,fontName:font1}
+{class:scene2d.Sprite,name:Sprite1,x:42,y:405,width:60,height:60,ox:0,oy:0,rotation:0,zindex:10,color:ffffffff,touchable:enabled,visible:true,textures:\"porgarett,portiberon\",duration:0.5,active:true,looping:true,frameCount:1}
+{class:scene2d.ImageJson,name:scene2d.ImageJson2,x:NaN,y:NaN,width:125,height:146,ox:0,oy:0,rotation:0,zindex:11,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play3d,x:230,y:331,width:307,height:67,ox:0,oy:0,rotation:0,zindex:12,color:ffcc00ff,touchable:enabled,visible:true,text:Play3d,fontName:font1}
+{class:scene2d.ImageJson,name:Image1,x:81,y:124.99999,width:120,height:120,ox:0,oy:0,rotation:0,zindex:13,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_play,effect:PatrolX,value:200,duration:2,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.Scene,background:img_bg_1_,music:None,transition:SlideRight,duration:1.1,interpolation:Linear}",source.Options:"{class:scene2d.ImageJson,name:scene2d.ImageJson5,x:110,y:411,width:40,height:40,ox:0,oy:0,rotation:42.40813,zindex:0,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson7,x:669,y:401,width:40,height:40,ox:0,oy:0,rotation:0,zindex:1,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson8,x:564.15094,y:15621.421,width:40,height:40,ox:0,oy:0,rotation:0,zindex:2,color:ffffffff,touchable:enabled,visible:true,texName:img_obj_snowflake,effect:PatrolY,value:600,duration:4,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:scene2d.ImageJson2,x:NaN,y:NaN,width:125,height:146,ox:0,oy:0,rotation:0,zindex:3,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:281,y:407,width:294,height:84,ox:0,oy:0,rotation:0,zindex:4,color:\"009999ff\",touchable:enabled,visible:true,text:Options,fontName:font1}
+{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox1,x:618,y:331,width:94,height:25,ox:0,oy:0,rotation:0,zindex:5,color:\"000000ff\",touchable:enabled,visible:true,text:\"   Music On\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.SelectBox,name:SelectBox1,x:391,y:242,width:85,height:33,ox:0,oy:0,rotation:-117.64598,zindex:6,color:ccccffff,touchable:enabled,visible:true,text:\"Easy,Medium,Hard,\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.TextField,name:TextField1,x:385,y:330,width:150,height:31,ox:0,oy:0,rotation:0,zindex:7,color:ccccffff,touchable:enabled,visible:true,text:pyros2097}
+{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox4,x:618,y:291,width:95,height:25,ox:0,oy:0,rotation:0,zindex:8,color:ccccffff,touchable:enabled,visible:true,text:\"  Sound On\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label2,x:44,y:314,width:322,height:81,ox:0,oy:0,rotation:0,zindex:9,color:ccccffff,touchable:enabled,visible:true,text:\"Player Name\",fontName:font3}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label5,x:86,y:225,width:268,height:81,ox:0,oy:0,rotation:0,zindex:10,color:ccccffff,touchable:enabled,visible:true,text:\"Game Mode\",fontName:font3}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Back,x:289,y:9,width:180,height:84,ox:0,oy:0,rotation:0,zindex:11,color:\"009999ff\",touchable:enabled,visible:true,text:Back,fontName:font1}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Slider,name:Slider1,x:592,y:236,width:140,height:18,ox:0,oy:0,rotation:0,zindex:12,color:ffffffff,touchable:enabled,visible:true,min:0,max:10,step:1,value:7}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Slider,name:Slider2,x:597,y:196,width:140,height:18,ox:0,oy:0,rotation:0,zindex:13,color:ccccffff,touchable:enabled,visible:true,min:0,max:10,step:1,value:6}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label5_1,x:122,y:124.99999,width:193,height:81,ox:0,oy:0,rotation:0,zindex:14,color:ccccffff,touchable:enabled,visible:true,text:Episode,fontName:font3}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:385,y:97,width:120,height:105,ox:0,oy:0,rotation:171.93307,zindex:15,color:ccccffff,touchable:disabled,visible:true}
+{class:com.badlogic.gdx.scenes.scene2d.ui.List,name:List1,x:413,y:101,width:68,height:100,ox:0,oy:0,rotation:0,zindex:16,color:ffffffff,touchable:enabled,visible:true,text:\"Episode 1,Episode 2,Episode 3,Episode 4,\"}
+{class:scene2d.Scene,background:img_bg_1_,music:None,transition:SlideRight,duration:2.1000001,interpolation:ElasticOut}",source.Game:"{class:scene2d.ImageJson,name:Player,x:131.13208,y:280,width:60,height:60,ox:0,oy:0,rotation:0,zindex:0,color:ffffffff,touchable:enabled,visible:true,texName:baldarov00,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Right,x:208.82353,y:107,width:70.85452,height:50,ox:0,oy:0,rotation:0,zindex:1,color:ffffffff,touchable:enabled,visible:true}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Back,x:335.29413,y:10,width:180,height:84,ox:0,oy:0,rotation:0,zindex:2,color:ffffffff,touchable:enabled,visible:true,text:Back,fontName:font1}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Timer,x:30.392181,y:405,width:245,height:84,ox:0,oy:0,rotation:0,zindex:3,color:ffffffff,touchable:enabled,visible:true,text:\"Timer:\",fontName:font1}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Left,x:21.568634,y:98,width:66.61896,height:58,ox:0,oy:0,rotation:0,zindex:4,color:ffffffff,touchable:enabled,visible:true}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Up,x:115.68628,y:162,width:69.59813,height:59,ox:0,oy:0,rotation:0,zindex:5,color:ffffffff,touchable:enabled,visible:true}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Down,x:110.7843,y:25,width:73.57042,height:57.999985,ox:0,oy:0,rotation:0,zindex:6,color:ffffffff,touchable:enabled,visible:true}
-{class:ImageJson,name:Enemy,x:613.72546,y:681.9183,width:70.61896,height:59,ox:0,oy:0,rotation:0,zindex:7,color:ffffffff,touchable:enabled,visible:true,texName:lord00,effect:PatrolY,value:200,duration:1.5,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
+{class:scene2d.ImageJson,name:Enemy,x:582.07544,y:211.232,width:70.61896,height:59,ox:0,oy:0,rotation:0,zindex:7,color:ffffffff,touchable:enabled,visible:true,texName:lord00,effect:PatrolY,value:200,duration:1.5,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Fire,x:651.9608,y:114.99999,width:66.6189,height:47.00003,ox:0,oy:0,rotation:0,zindex:8,color:ff6666ff,touchable:enabled,visible:true}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label3,x:31.372559,y:375,width:473,height:31,ox:0,oy:0,rotation:0,zindex:9,color:\"000000ff\",touchable:enabled,visible:true,text:\"Collide with enemy within 30 seconds\",fontName:arial}
-",GameWin:"{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:216.98112,y:329,width:294,height:84,ox:0,oy:0,rotation:0,zindex:1,color:ffffffff,touchable:enabled,visible:true,text:\"You Win\",fontName:font1}
-{class:Scene,background:img_bg_1_,music:None,transition:rightToLeft,duration:1,interpolation:Exp10In}
-",GameOver:"{class:Scene,background:img_bg_1_,music:None,transition:FadeOut,duration:3,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:205.66037,y:338,width:339,height:84,ox:0,oy:0,rotation:0,zindex:2,color:ffffffff,touchable:enabled,visible:true,text:\"You Lose\",fontName:font1}
-",Game3d:"{class:Scene,background:None,music:None,transition:FadeIn,duration:1,interpolation:Bounce}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:81.13208,y:126.99999,width:50,height:50,ox:0,oy:0,rotation:45,zindex:1,color:ffffffff,touchable:enabled,visible:true}
-",TicTacToe:"{class:Scene,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Exp10In}
+{class:scene2d.Scene,background:None,music:None,transition:None,duration:1.6,interpolation:Exp10In}",source.GameWin:"{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:216.98112,y:329,width:294,height:84,ox:0,oy:0,rotation:0,zindex:0,color:ffffffff,touchable:enabled,visible:true,text:\"You Win\",fontName:font1}
+{class:scene2d.Scene,background:img_bg_1_,music:None,transition:SlideRight,duration:2.1,interpolation:Exp10In}",source.GameOver:"{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:205.66037,y:338,width:339,height:84,ox:0,oy:0,rotation:0,zindex:0,color:ffffffff,touchable:enabled,visible:true,text:\"You Lose\",fontName:font1}
+{class:scene2d.Scene,background:img_bg_1_,music:None,transition:ShakeToBack,duration:0.4,interpolation:Exp10In}",source.Game3d:"{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:81.13208,y:126.99999,width:50,height:50,ox:0,oy:0,rotation:45,zindex:0,color:ffffffff,touchable:enabled,visible:true}
+{class:scene2d.Scene,background:None,music:None,transition:FadeIn,duration:1,interpolation:Bounce}",source.TicTacToe:"{class:scene2d.Scene,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Exp10In}
 {class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:117.92453,y:429,width:128,height:31,ox:0,oy:0,rotation:0,zindex:0,color:\"000000ff\",touchable:enabled,visible:true,text:TicTacToe,fontName:arial}
-",BasicDemo:"{class:Scene,background:\"img_bg_1_\",music:\"None\",transition:\"FadeIn\",duration:1.0,interpolation:Exp10In}
-{class:ImageJson,name:PauseButton,x:354.71698,y:346,width:120,height:120,ox:0,oy:0,rotation:0,zindex:1,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-"}
+",source.BasicDemo:"{class:scene2d.ImageJson,name:PauseButton,x:650,y:341,width:120,height:120,ox:0,oy:0,rotation:0,zindex:0,color:ffffffff,touchable:enabled,visible:true,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:217,y:401,width:347,height:35,ox:0,oy:0,rotation:0,zindex:1,color:\"000000ff\",touchable:enabled,visible:true,text:\"Try Panning with the mouse\",fontName:arial}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Left,x:25,y:227,width:87,height:31,ox:0,oy:0,rotation:0,zindex:2,color:\"000000ff\",touchable:enabled,visible:true,text:\"Left 10\",fontName:arial}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Right,x:679,y:237,width:104,height:31,ox:0,oy:0,rotation:0,zindex:3,color:\"000000ff\",touchable:enabled,visible:true,text:\"Right 10\",fontName:arial}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Bot,x:330,y:48,width:81,height:31,ox:0,oy:0,rotation:-16.24288,zindex:4,color:\"000000ff\",touchable:enabled,visible:true,text:\"Bot 10\",fontName:arial}
+{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Top,x:329,y:442,width:74,height:31,ox:0,oy:0,rotation:-16.24288,zindex:5,color:\"000000ff\",touchable:enabled,visible:true,text:Top10,fontName:arial}
+{class:scene2d.Scene,background:img_bg_1_,music:None,transition:FadeIn,duration:1,interpolation:Exp10In}"}

test/source/BasicDemo.java CHANGED Viewed

@@ -1,15 +1,19 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import scene2d.*;
 /** A Basic Demo Game Scene
  * <p>
- * This Scene showcases all the different features of the inbuilt Stage framework
+ * This Scene showcases all the different features of the inbuilt Scene framework
  * <p>
  * @author pyros2097 */
 public class BasicDemo extends Scene {
     Image pauseImage;
     Image pauseBtn;
@@ -19,18 +23,22 @@ public class BasicDemo extends Scene {
         //map = new Map(1, 24);
         //map.loadLayer(0);
         //map.loadLayer(1);
-        //Stage.addActor(map);
         pauseImage = new Image(Asset.skin.getRegion("default"));
-        pauseBtn = (Image) Stage.findActor("PauseButton");
+        pauseBtn = (Image) findActor("PauseButton");
+        Camera.addHud("PauseButton");
+        Camera.addHud("Label1");
+        Camera.addHud("Top");
-        Stage.addHud(pauseBtn);
+        Camera.addHud("Bot");
+        Camera.addHud("Left");
+        Camera.addHud("Right");
-        Stage.enablePanning();
+        Camera.usePan = true;
     }
     @Override
     public void onClick(Actor actor){
         if(actor.getName().equals("PauseButton")){
-             Stage.log("Clicked");
+             log("Clicked");
-             if(!Stage.pauseState){
+             if(!pauseState){
                  onPause();
              }
              else{
@@ -50,38 +58,38 @@ public class BasicDemo extends Scene {
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause() {
-        Stage.pauseState = true;
+        pauseState = true;
         pauseImage.setFillParent(true);
         pauseImage.setTouchable(Touchable.disabled);
         pauseImage.setColor(1, 1, 1, 0);
         pauseImage.addAction(Actions.alpha(0.6f, 0.7f, Interpolation.linear));
-        pauseImage.setPosition(Stage.getCameraX() - Stage.targetWidth/2,
+        pauseImage.setPosition(Camera.getX() - targetWidth/2,
-                Stage.getCameraY() - Stage.targetHeight/2);
+                Camera.getY() - targetHeight/2);
-        Stage.addActor(pauseImage);
+        addActor(pauseImage);
-        Stage.disablePanning();
+        Camera.usePan = false;
     }
     @Override
     public void onResume() {
-        Stage.pauseState = false;
+        pauseState = false;
         pauseImage.addAction(Actions.sequence(Actions.alpha(0f, 0.6f, Interpolation.linear),
             Actions.removeActor(pauseImage)));
-        Stage.enablePanning();
+        Camera.usePan = true;
     }
     @Override

test/source/Game.java CHANGED Viewed

@@ -1,6 +1,9 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import scene2d.*;
 /** A Basic Game Scene for the Game
  * <p>
@@ -20,24 +23,25 @@ public class Game extends Scene {
     String btnName = "";
     public Game(){
-        Stage.addHud(Stage.findActor("Up"));
+        Camera.addHud("Up");
-        Stage.addHud(Stage.findActor("Right"));
+        Camera.addHud("Right");
-        Stage.addHud(Stage.findActor("Left"));
+        Camera.addHud("Left");
-        Stage.addHud(Stage.findActor("Down"));
+        Camera.addHud("Down");
-        Stage.addHud(Stage.findActor("Timer"));
+        Camera.addHud("Timer");
-        Stage.addHud(Stage.findActor("Label3"));
+        Camera.addHud("Label3");
-        Stage.addHud(Stage.findActor("Fire"));
+        Camera.addHud("Fire");
-        Stage.setFollowSpeed(0.33f);
+        Camera.setFollowSpeed(1f);
-        player = (ImageJson) Stage.findActor("Player");
+        player = (ImageJson) findActor("Player");
-        enemy = (ImageJson) Stage.findActor("Enemy");
+        enemy = (ImageJson) findActor("Enemy");
-        Stage.followActorContinuously(player);
+        Camera.followActorContinuously(player);
-        timer = (Label)Stage.findActor("Timer");
+        timer = (Label)findActor("Timer");
-        startTime = Stage.gameUptime;
+        startTime = gameUptime;
     }
     @Override
     public void onTouchDown(Actor actor){
+        log(actor.getName());
         touchedDown = true;
         btnName = actor.getName();
     }
@@ -45,7 +49,7 @@ public class Game extends Scene {
     @Override
     public void onClick(Actor actor){
         if(actor.getName().equals("Back"))
-            Stage.setScene("Menu");
+            setScene("Menu");
         if(actor.getName().equals("Fire"))
             doFire();
     }
@@ -55,17 +59,18 @@ public class Game extends Scene {
         bullet.setPosition(player.getX() + 50, player.getY() + 50);
         bullet.setSize(25, 25);
         bullet.addAction(Actions.sequence(Actions.moveBy(500, 0, 1f), Actions.removeActor(bullet)));
-        Stage.addActor(bullet);
+        addActor(bullet);
     }
     @Override
     public void act(float delta){
+        super.act(delta);
-        diff = Stage.gameUptime - startTime;
+        diff = gameUptime - startTime;
         timer.setText("Timer: "+diff);
         if(diff>=30)
-            Stage.setScene("GameOver");
+            setScene("GameOver");
-        if(Stage.collides(player, enemy))
+        if(collides(player, enemy))
-            Stage.setScene("GameWin");
+            setScene("GameWin");
         //player.clearActions();
         switch(btnName){
             case "Right": player.addAction(Actions.moveBy(playerSpeed, 0, 0.1f)); break;
@@ -86,18 +91,18 @@ public class Game extends Scene {
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause(){

test/source/Game3d.java CHANGED Viewed

@@ -1,3 +1,5 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.graphics.g3d.utils.MeshPartBuilder;
 import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder;
@@ -5,6 +7,12 @@ import com.badlogic.gdx.graphics.VertexAttributes.Usage;
 import com.badlogic.gdx.graphics.g3d.Material;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.g3d.attributes.TextureAttribute;
+import scene3d.Actor3d;
+import scene3d.Camera3d;
+import scene3d.actions.Actions3d;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.Input.Keys;
+import scene2d.*;
 public class Game3d extends Scene {
     Actor3d ship;
@@ -28,9 +36,42 @@ public class Game3d extends Scene {
        }
        floor = new Actor3d(builder.end());
        floor.materials.get(0).set(TextureAttribute.createDiffuse(Asset.tex("concrete").getTexture()));
+       knight = Asset.loadModel("knight");
+       knight.setPosition(-20f, 18f, 0f);
+       knight.setPitch(-90f);
-       Stage.addActor3d(floor);
+       addActor3d(floor);
-       Stage.addActor3d(skydome);
+       addActor3d(skydome);
-       Stage.addActor3d(ship);
+       addActor3d(ship);
+       addActor3d(knight);
+       stage3d.getCamera().position.set(knight.getX()+ 13f, knight.getY() + 24f, knight.getZ() + 45f);
+       //Camera3d.followOffset(20f, 20f, -20f);
+      // Camera3d.followActor3d(knight, false);
+    }
+    float angle, angle2;
+    @Override
+    public void act(float delta){
+        super.act(delta);
+        angle = MathUtils.cosDeg(knight.getYaw() - 90); //90 degrees is correction factor
+        angle2 = -MathUtils.sinDeg(knight.getYaw() - 90);
+        if (upKey) {
+            knight.addAction3d(Actions3d.moveBy(angle, 0f, angle2, 1f));
+            stage3d.getCamera().translate(angle, 0f, angle2);
+        }
+        else if (downKey) {
+            knight.addAction3d(Actions3d.moveBy(-angle, 0f, -angle2, 1f));
+            stage3d.getCamera().translate(angle, 0f, angle2);
+        }
+        else if (rightKey) {
+            knight.rotateYaw(-2f);
+            if(stage3d.getCamera().direction.z > -0.76f)
+                Camera3d.rotateBy(-2f, 0f, 0f, 0f);
+        }
+        else if (leftKey) {
+            knight.rotateYaw(2f);
+            if(stage3d.getCamera().direction.z > -0.76f)
+                Camera3d.rotateBy(-2f, 0f, 0f, 0f);
+        }
     }
     @Override
@@ -55,12 +96,23 @@ public class Game3d extends Scene {
     public void onKeyTyped(char key){
     }
+    boolean rightKey, leftKey, upKey, downKey, spaceKey;
     @Override
     public void onKeyUp(int keycode){
+        if (keycode == Keys.LEFT) leftKey = false;
+        if (keycode == Keys.RIGHT) rightKey = false;
+        if (keycode == Keys.UP) upKey = false;
+        if (keycode == Keys.DOWN) downKey = false;
+        if (keycode == Keys.SPACE) spaceKey = false;
     }
     @Override
     public void onKeyDown(int keycode){
+        if (keycode == Keys.LEFT) leftKey = true;
+        if (keycode == Keys.RIGHT) rightKey = true;
+        if (keycode == Keys.UP) upKey = true;
+        if (keycode == Keys.DOWN) downKey = true;
+        if (keycode == Keys.SPACE) spaceKey = true;
     }
     @Override
@@ -74,4 +126,4 @@ public class Game3d extends Scene {
     @Override
     public void onDispose(){
     }
-}
+}

test/source/GameOver.java CHANGED Viewed

@@ -1,4 +1,7 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import scene2d.*;
 /** A Basic Game Over Scene for the Game
  * <p>
@@ -8,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor;
 public class GameOver extends Scene{
     public GameOver(){
-        Stage.setSceneWithDelay("Menu", 3f);
+        setSceneWithDelay("Menu", 3f);
     }
     @Override
@@ -25,18 +28,18 @@ public class GameOver extends Scene{
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause(){

test/source/GameWin.java CHANGED Viewed

@@ -1,4 +1,7 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import scene2d.*;
 /** A Basic Game Win Scene for the Game
  * <p>
@@ -8,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor;
 public class GameWin extends Scene {
     public GameWin(){
-        Stage.setSceneWithDelay("Menu", 3f);
+       setSceneWithDelay("Menu", 3f);
     }
     @Override
@@ -25,18 +28,18 @@ public class GameWin extends Scene {
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause(){

test/source/Menu.java CHANGED Viewed

@@ -1,29 +1,32 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import scene2d.*;
 /** A Basic Main Menu for the Game
  * <p>
  * The Main Menu Displays all the scenes to which the game can switch too. Based on which button or
- * image or widget pressed the scene can be switched.
+ * image or widget pressed the scene can be switched.
  * <p>
  * @author pyros2097 */
 public class Menu extends Scene {
     public Menu(){
-        Stage.log("Hello World");
+        log("Hello World");
-        Stage.log("new dat");
+        log("new dat");
-        Stage.showToast("Toasting", 2f);
+        showToast("Toasting", 2f);
     }
     @Override
     public void onClick(Actor actor){
         if(actor.getName().equals("Play"))
-           Stage.setScene("Game");
+           setScene("Game");
         if(actor.getName().equals("Play3d"))
-           Stage.setScene("Game3d");
+           setScene("Game3d");
         if(actor.getName().equals("Options"))
-           Stage.setScene("Options");
+           setScene("Options");
         if(actor.getName().equals("Exit"))
-            Stage.showMessageDialog("Exit", "    Are you sure you want \n    to Quit the Game   ");
+           showMessageDialog("Exit", "    Are you sure you want \n    to Quit the Game   ");
     }
     @Override
@@ -39,22 +42,22 @@ public class Menu extends Scene {
     @Override
     public void onGesture(GestureType type){
         if(type == GestureType.Up)
-            Stage.log("Up");
+            log("Up");
         else if(type == GestureType.Down)
-            Stage.log("Down");
+            log("Down");
     }
     @Override
     public void onKeyTyped(char key){
-    }
+    }
     @Override
     public void onKeyUp(int keycode){
-    }
+    }
     @Override
     public void onKeyDown(int keycode){
-    }
+    }
      @Override
     public void onPause(){

test/source/Options.java CHANGED Viewed

@@ -1,26 +1,28 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import scene2d.*;
-/** A Basic Options Scene for the Game
+/** A Basic Main Menu for the Game
  * <p>
- * The Options Scene displays the necessary settings which can be modified by the user like
+ * The Main Menu Displays all the scenes to which the game can switch too. Based on which button or
- * musicOn, soundOn, panCamera, battleAnimations etc. The widgets once changed must persist
- * the changes to the preferences which can be accessed by Config.prefs
+ * image or widget pressed the scene can be switched.
  * <p>
  * @author pyros2097 */
 public class Options extends Scene {
     public Options(){
-        Stage.log("Hello From Options");
     }
     @Override
     public void onClick(Actor actor){
         if(actor.getName().equals("Back"))
-           Stage.setScene("Menu");
+           setScene("Menu");
     }
     @Override
-    public void onTouchDown(Actor actor){}
+    public void onTouchDown(Actor actor){
+    }
     @Override
     public void onTouchUp(){}
@@ -29,21 +31,26 @@ public class Options extends Scene {
     public void onDragged(){}
     @Override
-    public void onGesture(GestureType type){}
+    public void onGesture(GestureType type){
-    @Override
+        if(type == GestureType.Up)
+            log("Up");
-    public void onKeyTyped(char key){
+        else if(type == GestureType.Down)
+            log("Down");
-    }
+    }
-    @Override
-    public void onKeyUp(int keycode){
-    }
-    @Override
-    public void onKeyDown(int keycode){
-    }
     @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
+     @Override
     public void onPause(){
     }

test/source/Splash.java CHANGED Viewed

@@ -1,4 +1,7 @@
+package source;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -8,6 +11,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import scene2d.*;
 /** A Basic SplashScreen for the Game
  * <p>
  * The SplashScene loads all the splash assets to be shown directly from the file system
@@ -33,10 +38,10 @@ public class Splash extends Scene {
         loadingLabel = new Label(loadingText, Asset.skin);
         loadingLabel.setColor(Color.BLACK);
         loadingLabel.setFontScale(3f);
-        Stage.addActor(imgbg1);
+        addActor(imgbg1);
-        Stage.addActor(imgbg2);
+        addActor(imgbg2);
-        Stage.addActor(loadingLabel, Stage.targetWidth/2, 23f);
+        addActor(loadingLabel, targetWidth/2, 23f);
-        Stage.addAction(Actions.sequence(Actions.delay(4f), Actions.removeActor(imgbg1)
+        addAction(Actions.sequence(Actions.delay(4f), Actions.removeActor(imgbg1)
         , Actions.delay(4f), Actions.removeActor(imgbg2)));
         loadingLabel.addAction(Actions.forever(Actions.forever(Actions.sequence(
@@ -72,18 +77,18 @@ public class Splash extends Scene {
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause(){

test/source/TicTacToe.java CHANGED Viewed

@@ -1,3 +1,5 @@
+package source;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
@@ -6,6 +8,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import java.util.Random;
+import scene2d.*;
 /**
  *  A Basic TicTacToe Game
  Scene
@@ -26,7 +30,7 @@ public class TicTacToe extends Scene {
             for(int j = 0;j < 3;j++){
                 Box box = new Box(i, j);
                 boxes[i][j] = box;
-                Stage.addActor(box, box.getWidth()*j, box.getHeight()*i);
+                addActor(box, box.getWidth()*j, box.getHeight()*i);
             }
         }
     }
@@ -41,22 +45,22 @@ public class TicTacToe extends Scene {
     public static void setMode(GameMode gm){
         gameMode = gm;
-        Stage.log("Game Mode: " + gameMode.toString());
+        log("Game Mode: " + gameMode.toString());
     }
     public void reset(){
-        Stage.log("Reset");
+        log("Reset");
         turnCounter = 0;
-        Stage.setScene("TicTacToe");
+        setScene("TicTacToe");
     }
     public void playerWin(){
-        Stage.log("Player Win");
+        log("Player Win");
         reset();
     }
     public void computerWin(){
-        Stage.log("Computer Win");
+        log("Computer Win");
         reset();
     }
@@ -66,7 +70,7 @@ public class TicTacToe extends Scene {
     void AI(){
         if(mode(GameMode.SINGLE_PLAYER_VS_COMPUTER)){
             if(currentTurn == Turn.Computer){
-                Stage.log("AI");
+                log("AI");
                 random1 = rand.nextInt(3);
                 random2 = rand.nextInt(3);
                 if(!boxes[random1][random2].isMarked){
@@ -126,7 +130,7 @@ public class TicTacToe extends Scene {
             checkForDiagonal();
         }
         else{
-            Stage.log("Draw Match");
+            log("Draw Match");
             reset();
         }
     }
@@ -145,18 +149,18 @@ public class TicTacToe extends Scene {
     @Override
     public void onGesture(GestureType type){}
-    @Override
+    @Override
-    public void onKeyTyped(char key){
+    public void onKeyTyped(char key){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyUp(int keycode){
+    public void onKeyUp(int keycode){
-    }
+    }
-    @Override
+    @Override
-    public void onKeyDown(int keycode){
+    public void onKeyDown(int keycode){
-    }
+    }
     @Override
     public void onPause(){
@@ -199,7 +203,7 @@ class Box extends Group{
                     else if(TicTacToe.mode(GameMode.SINGLE_PLAYER_VS_COMPUTER))
                         if(TicTacToe.currentTurn == Turn.Player)
                             markByPlayer();
-                    Stage.log("Box Clicked "+Box.this.row+Box.this.col);
+                    Scene.log("Box Clicked "+Box.this.row+Box.this.col);
                 }
             }
         });
@@ -238,4 +242,4 @@ enum GameMode {
     SINGLE_PLAYER,
     SINGLE_PLAYER_VS_COMPUTER,
     MULTI_PLAYER,
-}
+}

test/test.apk DELETED Viewed

Binary file

~repos /gdx-studio

git clone https://pyrossh.dev/repos/gdx-studio.git

An IDE for creating Games using libgdx and Java supported on all platforms Android, iOS, Desktop