gdx-studio

git clone https://pyrossh.dev/repos/gdx-studio.git
Discussions: https://groups.google.com/g/rust-embed-devs

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

7c848771 — pyros2097

some changes

Files changed (96) hide show

IDE/Content.java +2 -15
IDE/Editor.java +2 -1
IDE/Frame.java +10 -22
IDE/SearchBar.java +13 -19
IDE/StatusBar.java +14 -41
IDE/Style.java +249 -394
IDE/ToolBar.java +52 -25
Panel/ActorPanel.java +42 -7
Panel/BaseList.java +8 -2
Panel/BaseTable.java +19 -6
Panel/ConsolePanel.java +2 -1
Panel/DashPanel.java +2 -1
Panel/EffectPanel.java +3 -0
Panel/OptionsPanel.java +51 -17
Panel/ProjectPanel.java +20 -4
Panel/PropertyPanel.java +53 -28
Panel/ReplacePanel.java +3 -1
Panel/SceneEffectPanel.java +25 -20
Panel/ScenePanel.java +297 -63
Panel/SceneTemplate.txt +10 -2
Panel/StudioPanel.java +18 -281
Panel/TablePanel.java +1 -1
Panel/WidgetPanel.java +1 -1
Panel/project.properties +0 -11
Stage/Asset.java +24 -4
Stage/Config.java +2 -3
Stage/Map.java +34 -3
Stage/Scene.java +27 -20
Stage/Serializer.java +210 -107
Stage/Sprite.java +2 -1
Stage/Stage.java +69 -85
test/asset +1 -1
test/atlas/charset.atlas +124 -124
test/atlas/charset.png +0 -0
test/atlas/pack.atlas +325 -0
test/atlas/pack.png +0 -0
test/atlas/pack2.png +0 -0
test/config +3 -3
test/model/skydome.g3db +0 -0
test/model/skydome.png +0 -0
test/pack/charset/661.png +0 -0
test/pack/charset/662.png +0 -0
test/pack/charset/663.png +0 -0
test/pack/charset/771.png +0 -0
test/pack/charset/772.png +0 -0
test/pack/charset/775.png +0 -0
test/pack/charset/Thumbs.db +0 -0
test/pack/charset/alfador00.png +0 -0
test/pack/charset/alfador01.png +0 -0
test/pack/charset/baldarov00.png +0 -0
test/pack/charset/baldarov01.png +0 -0
test/pack/charset/calais00.png +0 -0
test/pack/charset/calais01.png +0 -0
test/pack/charset/citizen.png +0 -0
test/pack/charset/earcher.png +0 -0
test/pack/charset/elemental.png +0 -0
test/pack/charset/esoldier.png +0 -0
test/pack/charset/garett00.png +0 -0
test/pack/charset/garett01.png +0 -0
test/pack/charset/lizardman.png +0 -0
test/pack/charset/lord00.png +0 -0
test/pack/charset/lord01.png +0 -0
test/pack/charset/merman.png +0 -0
test/pack/charset/mina.png +0 -0
test/pack/charset/pguardian.png +0 -0
test/pack/charset/poralfador.png +0 -0
test/pack/charset/porbaldarov.png +0 -0
test/pack/charset/porcalais.png +0 -0
test/pack/charset/porgarett.png +0 -0
test/pack/charset/porlord.png +0 -0
test/pack/charset/porsabra.png +0 -0
test/pack/charset/porserpentknight.png +0 -0
test/pack/charset/portiberon.png +0 -0
test/pack/charset/porwizard.png +0 -0
test/pack/charset/psoldier.png +0 -0
test/pack/charset/sabra00.png +0 -0
test/pack/charset/sabra01.png +0 -0
test/pack/charset/serpentknight00.png +0 -0
test/pack/charset/serpentknight01.png +0 -0
test/pack/charset/shaka.png +0 -0
test/pack/charset/tiberon00.png +0 -0
test/pack/charset/tiberon01.png +0 -0
test/pack/charset/tribeman.png +0 -0
test/pack/charset/wizard00.png +0 -0
test/pack/charset/wizard01.png +0 -0
test/pack/concrete.png +0 -0
test/scene +56 -58
test/source/BasicDemo.java +18 -6
test/source/Game.java +12 -0
test/source/Game3d.java +38 -2
test/source/GameOver.java +17 -5
test/source/GameWin.java +17 -5
test/source/Menu.java +18 -6
test/source/Options.java +19 -7
test/source/Splash.java +15 -3
test/source/TicTacToe.java +14 -1

IDE/Content.java CHANGED Viewed

@@ -1,9 +1,9 @@
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
-import java.awt.Graphics;
 import java.awt.Insets;
 import java.io.File;
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -29,7 +29,6 @@ final public class Content extends JPanel {
     public static RTextScrollPane editorScroll;
     public static StudioPanel studioPanel;
     private static ReplacePanel replacePanel;
-	private static OptionsPanel optionsPanel;
 	public static AssetPanel assetPanel;
 	private static ConsolePanel consolePanel;
@@ -66,9 +65,6 @@ final public class Content extends JPanel {
         JPanel north = new JPanel(new VerticalFlowLayout());
         replacePanel = new ReplacePanel();
         north.add(replacePanel);
-        //north.add(title);
-        optionsPanel = new OptionsPanel();
-        north.add(optionsPanel);
 		add(north, BorderLayout.NORTH);
         add(card, BorderLayout.CENTER);
@@ -79,12 +75,7 @@ final public class Content extends JPanel {
         vert.add(assetPanel);
         vert.add(consolePanel);
         add(vert, BorderLayout.SOUTH);
-	}
-	@Override
-	public void paintComponent(Graphics g){
-		Style.drawRightBorder(g, getWidth(), getHeight());
-		Style.drawLeftBorder(g, getWidth(), getHeight());
+        setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, Style.border));
 	}
 	private static boolean canvasChanged = true;
@@ -131,10 +122,6 @@ final public class Content extends JPanel {
     	}
     }
-	public static void toggleOptions(){
-		optionsPanel.setVisible(!optionsPanel.isVisible());
-	}
 	public static void toggleReplace(){
 		replacePanel.setVisible(!replacePanel.isVisible());
 	}

IDE/Editor.java CHANGED Viewed

@@ -28,7 +28,7 @@ final public class Editor extends TextEditorPane {
 	static DefaultCompletionProvider provider = new DefaultCompletionProvider();
 	public static SearchContext context = new SearchContext();
-	final Timer saveTimer = new Timer(30000, new ActionListener(){
+	final private Timer saveTimer = new Timer(60000, new ActionListener(){
 		@Override
 		public void actionPerformed(ActionEvent arg0) {
 			save();
@@ -38,6 +38,7 @@ final public class Editor extends TextEditorPane {
 	public Editor(){
 		super(TextEditorPane.INSERT_MODE, true);
+		saveTimer.start();
         setMargin(new Insets(0, 0, 0, 0));
         setMarginLineEnabled(true);
         setMarginLineColor(new Color(248,248,248)); //FIXME color not changing

IDE/Frame.java CHANGED Viewed

@@ -1,6 +1,5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Graphics;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
@@ -11,6 +10,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import web.laf.lite.layout.VerticalFlowLayout;
+import web.laf.lite.utils.UIUtils;
 final public class Frame extends JFrame implements WindowListener{
 	private static final long serialVersionUID = 1L;
@@ -39,6 +39,7 @@ final public class Frame extends JFrame implements WindowListener{
     private Frame() {
        setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
        addWindowListener(this);
+       //styleProject();
     }
     public static Frame getInstance(){
@@ -50,18 +51,11 @@ final public class Frame extends JFrame implements WindowListener{
     public void initToolBar(){
     	toolBar = new ToolBar();
     	add(toolBar, BorderLayout.NORTH);
-    	styleProject();
     }
     public void initSideBar(){
-   	 	rightSideBar = new JPanel(new VerticalFlowLayout(0, 10)){
+   	 	rightSideBar = new JPanel(new VerticalFlowLayout(0, 10));
-			private static final long serialVersionUID = 1L;
-			@Override
-	   		public void paintComponent(Graphics g){
-	   			Style.drawVerticalBar(g, getWidth(), getHeight());
+   	 	UIUtils.setUndecorated(rightSideBar, true);
-	   		}
-   	 	};
    	 	dashPanel = new DashPanel();
    	 	widgetPanel = new WidgetPanel();
    	 	propertyPanel = new PropertyPanel();
@@ -74,14 +68,8 @@ final public class Frame extends JFrame implements WindowListener{
    	 	rightSideBar.add(eventPanel);
    	 	rightSideBar.add(widgetPanel);
-   	 	leftSideBar = new JPanel(new VerticalFlowLayout(0, 10)){
+   	 	leftSideBar = new JPanel(new VerticalFlowLayout(0, 10));
-   	 	private static final long serialVersionUID = 1L;
-	   	 	@Override
-	   		public void paintComponent(Graphics g){
-	   			Style.drawVerticalBar(g, getWidth(), getHeight());
+   	 	UIUtils.setUndecorated(leftSideBar, true);
-	   		}
-   	 	};
    	 	projectPanel = new ProjectPanel();
    	 	projectSettingsPanel = new ProjectSettingsPanel();
    	 	projectSettingsPanel.setVisible(false);
@@ -197,6 +185,7 @@ final public class Frame extends JFrame implements WindowListener{
     		btn.setForeground(Style.font);
     		btn.setBackground(Style.topColor);
     	}
+    	toolBar.searchBar.setBackground(Style.listBg);
     }
     private static void stylePanel(JPanel panel){
@@ -204,17 +193,17 @@ final public class Frame extends JFrame implements WindowListener{
     	panel.setBackground(Style.botColor);
     	for(Component c: panel.getComponents()){
     		c.setForeground(Style.font);
-    		c.setBackground(Style.topColor);
+    		c.setBackground(Style.botColor);
     		if(c instanceof BaseList){
     			((BaseList)c).list.setBackground(Style.listBg);
     			((BaseList)c).list.setForeground(Style.font);
-    			((BaseList)c).list.setSelectionBackground(Style.border);
+    			((BaseList)c).list.setSelectionBackground(Style.listSelect);
     			((BaseList)c).list.setSelectionForeground(Style.headerFg);
     		}
     		else if(c instanceof BaseTable){
     			((BaseTable)c).table.setBackground(Style.listBg);
     			((BaseTable)c).table.setForeground(Style.font);
-    			((BaseTable)c).table.setSelectionBackground(Style.font);
+    			((BaseTable)c).table.setSelectionBackground(Style.listSelect);
     			((BaseTable)c).table.setSelectionForeground(Style.headerFg);
     		}
     		else if(c instanceof Style.TitleLabel)
@@ -268,7 +257,6 @@ final public class Frame extends JFrame implements WindowListener{
 	@Override
 	public void windowClosing(WindowEvent arg0) {
-		ScenePanel.save();
 		Content.editor.save();
 		if(Content.studioPanel.canvas != null)
 			Stage.clear();

IDE/SearchBar.java CHANGED Viewed

@@ -20,23 +20,7 @@ final public class SearchBar extends JTextField {
 		UIUtils.setShadeWidth(this, 0);
         setPreferredSize(new Dimension(280, 22));
-        JButton searchUpBtn = Style.createToolButton("up");
+        JButton searchUpBtn = Style.createToolButton("SearchUP", "up", new ActionListener(){
-        UIUtils.setLeftRightSpacing(searchUpBtn, 0);
-        UIUtils.setUndecorated(searchUpBtn, true);
-        JButton searchDownBtn = Style.createToolButton("down");
-        UIUtils.setLeftRightSpacing(searchDownBtn, 0);
-        UIUtils.setUndecorated(searchDownBtn, true);
-        JPanel updownPanel = new JPanel(new HorizontalFlowLayout(0));
-        updownPanel.add(searchUpBtn);
-        updownPanel.add(searchDownBtn);
-        updownPanel.setOpaque(false);
-        UIUtils.setUndecorated(updownPanel, true);
-        UIUtils.setTrailingComponent(this, updownPanel);
-        searchUpBtn.addActionListener( new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				if(Content.currentView.equals("Editor")){
@@ -45,8 +29,9 @@ final public class SearchBar extends JTextField {
 				}
 			}
         });
+        UIUtils.setLeftRightSpacing(searchUpBtn, 0);
+        UIUtils.setUndecorated(searchUpBtn, true);
-        searchDownBtn.addActionListener( new ActionListener(){
+        JButton searchDownBtn = Style.createToolButton("SearchDown", "down", new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				if(Content.currentView.equals("Editor")){
@@ -55,5 +40,14 @@ final public class SearchBar extends JTextField {
 				}
 			}
         });
+        UIUtils.setLeftRightSpacing(searchDownBtn, 0);
+        UIUtils.setUndecorated(searchDownBtn, true);
+        JPanel updownPanel = new JPanel(new HorizontalFlowLayout(0));
+        updownPanel.add(searchUpBtn);
+        updownPanel.add(searchDownBtn);
+        updownPanel.setOpaque(false);
+        UIUtils.setUndecorated(updownPanel, true);
+        UIUtils.setTrailingComponent(this, updownPanel);
 	}
 }

IDE/StatusBar.java CHANGED Viewed

@@ -13,18 +13,13 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryUsage;
 import java.text.DecimalFormat;
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
-import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 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.LafUtils;
 import web.laf.lite.utils.UIUtils;
 import web.laf.lite.utils.UpdateTimer;
@@ -81,6 +76,7 @@ final public class StatusBar extends JPanel {
          //initUpdate();
          //initNuke(); //Reduce nuke size
          add(new MemoryBar(), ToolbarLayout.END);
+         setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Style.border));
 	}
 	public void addSpace(){
@@ -88,25 +84,9 @@ final public class StatusBar extends JPanel {
 	}
 	public void addSeparator(){
+		JLabel comp = new JLabel();
+		comp.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, Style.border));
-		add(new VBar(), ToolbarLayout.START);
+		add(comp, ToolbarLayout.START);
-	}
-	class VBar extends JComponent {
-		private static final long serialVersionUID = 1L;
-		@Override
-		protected void paintComponent(Graphics g) {
-		    super.paintComponent(g);
-		    g.setColor(Style.border);
-		    g.drawLine(0, 1, 0, getHeight());
-		}
-	}
-	@Override
-	protected void paintComponent(Graphics g) {
-	    //Style.drawHorizontalBar(g, getWidth (), getHeight ());
-	    super.paintComponent(g);
-	    Style.drawTopBorder(g, getWidth());
 	}
 	public static void updateCaret(int row, int col){
@@ -156,31 +136,25 @@ final public class StatusBar extends JPanel {
 	}
 	void initZoomIn(){
-		final JButton zoomin = Style.createExplorerToolButton("ZoomIn", "szoomin", null);
+		add(Style.createToolPanel("ZoomIn", "szoomin", new ActionListener(){
-		zoomin.addActionListener(new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				Content.editor.zoomin();
 			}
-		});
+		}));
-		add(zoomin);
 	}
 	void initZoomOut(){
-		final JButton zoomout = Style.createExplorerToolButton("ZoomOut", "szoomout", null);
+		add(Style.createToolPanel("ZoomOut", "szoomout", new ActionListener(){
-		zoomout.addActionListener(new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				Content.editor.zoomout();
 			}
-		});
+		}));
-		add(zoomout);
 	}
 	void initUpdate(){
-		final JButton update = Style.createExplorerToolButton("Update", "supdate", null);
+		/*final JButton update = Style.createExplorerToolButton("Update", "supdate", null);
 		ButtonPopup menu = new ButtonPopup(update, PopupWay.upCenter);
         JPanel popupContent = new JPanel (new VerticalFlowLayout(5, 10));
         popupContent.add(UIUtils.setBoldFont(new JLabel("SkyCode v0.39")));
@@ -192,18 +166,17 @@ final public class StatusBar extends JPanel {
         popupContent.add(new JLabel("Bug Fixes"));
         popupContent.setOpaque(false);
         menu.setContent (popupContent);
-		add(update, ToolbarLayout.END);
+		add(update, ToolbarLayout.END);*/
 	}
 	void initNuke(){
-		final JButton nuke = Style.createExplorerToolButton("Free Memory", "snuke", new ActionListener(){
+		add(Style.createToolPanel("Free Memory", "snuke", new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				System.gc();
 			}
-		});
+		}));
-		add(nuke, ToolbarLayout.END);
-	}
+	}
 }
 class MemoryBar extends JLabel{

IDE/Style.java CHANGED Viewed

@@ -1,317 +1,263 @@
-import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.HashMap;
-import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
-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.ColorUtils;
 import web.laf.lite.utils.UIUtils;
-import web.laf.lite.widget.CenterPanel;
 public enum Style {
-	 BLUE, DARK;
+	BLUE, DARK;
-	 private static Style currentStyle = Style.BLUE;
+	private static Style currentStyle = Style.BLUE;
-	 public static Color topColor;
+	public static Color topColor;
-	 public static Color botColor;
+	public static Color botColor;
-	 public static Color headerTopLine;
+	public static Color headerTopLine;
-	 public static Color headerBg;
+	public static Color headerBg;
-	 public static Color headerBgBot;
+	public static Color headerBgBot;
-	 public static Color headerFg;
+	public static Color headerFg;
-	 public static Color border;
+	public static Color border;
-	 public static Color focus;
+	public static Color focus;
-	 public static Color font;
+	public static Color font;
-	 public static Color listBg;
+	public static Color listBg;
+	public static Color listSelect;
+	public static Color topLineColor = new Color(0x4580c8);
+	public static Color bottomColor = new Color(0x1956ad);
+	private static HashMap<Style, ArrayList<Color>> stylesMap = new HashMap<Style, ArrayList<Color>>();
+	/* top, bot, headerTopline, headerBg, headerBgBot, headerFg, border, focus, font, listBg, listSelect*/
+	private static String blueColors = "e4e4e4,d1d1d1,e8eaeb,2a3b57,1a2b47,ffffff,"
+			+ "808080,ef8e39,000000,ffffff,000080";
+	private static String darkColors = "213134,272b2f,6C788C,20272a,0b0e20,93c705,"
+			+ "404040,ef8e39,e4e0e2,272b2f,000080";
+	static {
+		stylesMap.put(Style.BLUE, getColor(blueColors));
+		stylesMap.put(Style.DARK, getColor(darkColors));
+		setStyle(Style.BLUE);
+	}
+	public static void setStyle(Style style){
+		currentStyle = style;
+		topColor = stylesMap.get(currentStyle).get(0);
+		botColor = stylesMap.get(currentStyle).get(1);
+		headerTopLine = stylesMap.get(currentStyle).get(2);
+		headerBg = stylesMap.get(currentStyle).get(3);
+		headerBgBot = stylesMap.get(currentStyle).get(4);
+		headerFg = stylesMap.get(currentStyle).get(5);
+		border = stylesMap.get(currentStyle).get(6);
+		focus = stylesMap.get(currentStyle).get(7);
+		font = stylesMap.get(currentStyle).get(8);
+		listBg = stylesMap.get(currentStyle).get(9);
+		listSelect = stylesMap.get(currentStyle).get(10);
+	}
+	private static ArrayList<Color> getColor(String colorsString){
+		ArrayList<Color> listColor = new ArrayList<Color>();
+		for(String c: colorsString.split(","))
+			listColor.add(ColorUtils.parseHexColor(c));
+		return listColor;
+	}
+	public static Color canvasBg = new Color(108, 108, 108);
+	public static Color canvasScreen = new Color(28, 28, 28);
+	public static Color canvasShadowTop = new Color(108, 108, 108);
+	public static Color canvasShadowBot = new Color(155, 155, 155);
+	public static Color canvasBox = new Color(83, 82, 82);
+	private static Color scrollBg = new Color ( 245, 245, 245 );
+	private static Color scrollBorder = new Color ( 230, 230, 230 );
-	 public static Color topLineColor = new Color(0x4580c8);
+	private static Color scrollBarBorder = new Color ( 201, 201, 201 );
-	 public static Color bottomColor = new Color(0x1956ad);
+	private static Color scrollGradientLeft = new Color ( 239, 239, 239 );
-	 private static HashMap<Style, ArrayList<Color>> stylesMap = new HashMap<Style, ArrayList<Color>>();
-	 /* top, bot, headerTopline, headerBg, headerBgBot, headerFg, border, focus, font, listBg*/
-	 private static String blueColors = "e4e4e4,d1d1d1,e8eaeb,2a3b57,1a2b47,ffffff,"
-			 + "808080,ef8e39,000000,ffffff";
-	 private static String darkColors = "213134,272b2f,6C788C,20272a,0b0e20,93c705,"
+	private static Color scrollSelGradientLeft = new Color ( 203, 203, 203 ); //33
-			 + "404040,ef8e39,e4e0e2,272b2f";
-	 static {
-		 stylesMap.put(Style.BLUE, getColor(blueColors));
+	private static Color scrollGradientRight = new Color ( 211, 211, 211 );
-		 stylesMap.put(Style.DARK, getColor(darkColors));
+	private static Color scrollSelGradientRight = new Color ( 175, 175, 175 );//-45
-		 setStyle(Style.BLUE);
-	 }
+	public static HashMap<String, JButton> btnMap = new HashMap<String, JButton>();
+	public static ArrayList<JButton> viewGroup = new ArrayList<JButton>();
-	 public static void setStyle(Style style){
+	private static GradientPaint headerBgPaint;
-		 currentStyle = style;
-		 topColor = stylesMap.get(currentStyle).get(0);
-		 botColor = stylesMap.get(currentStyle).get(1);
-		 headerTopLine = stylesMap.get(currentStyle).get(2);
-		 headerBg = stylesMap.get(currentStyle).get(3);
-		 headerBgBot = stylesMap.get(currentStyle).get(4);
-		 headerFg = stylesMap.get(currentStyle).get(5);
-		 border = stylesMap.get(currentStyle).get(6);
-		 focus = stylesMap.get(currentStyle).get(7);
-		 font = stylesMap.get(currentStyle).get(8);
-		 listBg = stylesMap.get(currentStyle).get(9);
-	 }
-	 private static ArrayList<Color> getColor(String colorsString){
-		 ArrayList<Color> listColor = new ArrayList<Color>();
-		 for(String c: colorsString.split(","))
-			 listColor.add(ColorUtils.parseHexColor(c));
-		 return listColor;
-	 }
-	 public static Color canvasBg = new Color(108, 108, 108);
-	 public static Color canvasScreen = new Color(28, 28, 28);
-	 public static Color canvasShadowTop = new Color(108, 108, 108);
-	 public static Color canvasShadowBot = new Color(155, 155, 155);
-	 public static Color canvasBox = new Color(83, 82, 82);
-	 private static Color scrollBg = new Color ( 245, 245, 245 );
-	 private static Color scrollBorder = new Color ( 230, 230, 230 );
-	 private static Color scrollBarBorder = new Color ( 201, 201, 201 );
-	 private static Color scrollGradientLeft = new Color ( 239, 239, 239 );
-	 private static Color scrollSelGradientLeft = new Color ( 203, 203, 203 ); //33
-	 private static Color scrollGradientRight = new Color ( 211, 211, 211 );
-	 private static Color scrollSelGradientRight = new Color ( 175, 175, 175 );//-45
-	 public static HashMap<String, JButton> btnMap = new HashMap<String, JButton>();
-	 public static ArrayList<JButton> viewGroup = new ArrayList<JButton>();
-	 private static GradientPaint headerBgPaint;
-	 final public static void drawBottomBorder(Graphics g, int width, int height){
-		 g.setColor(Style.border);
-		 g.drawLine(0, height-1, width, height-1);
-	 }
-	 final public static void drawTopBorder(Graphics g, int width){
-		 g.setColor(Style.border);
-		 g.drawLine(0, 0, width, 0);
-	 }
-	 final public static void drawRightBorder(Graphics g, int width, int height){
-		 g.setColor(Style.border);
-		 g.drawLine(width-1, 0, width-1, height);
-	 }
-	 final public static void drawLeftBorder(Graphics g, int width, int height){
-		 g.setColor(Style.border);
-		 g.drawLine(0, 0, 0, height);
-	 }
-	 private static final int margin = 15;
+	private static final int margin = 15;
-	 private static final int marginsub5 = 10;
+	private static final int marginsub5 = 10;
-	 private static final int margin5 = 20;
+	private static final int margin5 = 20;
-	 private static final int targetW = 800+55;
+	private static final int targetW = 800+55;
-	 private static final int targetH = 480;
+	private static final int targetH = 480;
-	 final 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.setColor(Style.canvasShadowBot);
-		 g.drawLine(margin, targetH+margin5, targetW+marginsub5, targetH+margin5);//hoz shadow y same
-		 g.drawLine(targetW+margin, margin, targetW+margin, targetH+margin);// vert shadow x same
-		 g.setColor(Style.canvasBox);
-		 g.fillRect(0, targetH+3*margin, width, 2);
-		 g.fillRect(0, targetH+3*margin+3, width, height-targetH+3*margin-3);
-	 }
-	 public static Color tableHeaderTopLineColor = new Color ( 232, 234, 235 );
-	 public static Color tableHeaderTopBgColor = new Color ( 226, 226, 226 );
-	 public static Color tableHeaderBotBgColor = new Color ( 201, 201, 201 );
-	 public static Color tableHeaderBotLineColor = new Color ( 104, 104, 104 );
-	 public static void drawTableHeader(Graphics g, int width, int height){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 // Table header background
-		 GradientPaint bgPaint = new GradientPaint (0, 1, topColor, 0, height - 1, botColor);
-		 g2d.setPaint(bgPaint);
-		 g2d.fillRect(0, 1, width, height - 1);
+	final 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.setColor(Style.canvasShadowBot);
+		g.drawLine(margin, targetH+margin5, targetW+marginsub5, targetH+margin5);//hoz shadow y same
+		g.drawLine(targetW+margin, margin, targetW+margin, targetH+margin);// vert shadow x same
+		g.setColor(Style.canvasBox);
+		g.fillRect(0, targetH+3*margin, width, 2);
+		g.fillRect(0, targetH+3*margin+3, width, height-targetH+3*margin-3);
+	}
+	public static Color tableHeaderTopLineColor = new Color ( 232, 234, 235 );
+	public static Color tableHeaderTopBgColor = new Color ( 226, 226, 226 );
+	public static Color tableHeaderBotBgColor = new Color ( 201, 201, 201 );
+	public static Color tableHeaderBotLineColor = new Color ( 104, 104, 104 );
+	public static void drawTableHeader(Graphics g, int width, int height){
+		Graphics2D g2d = ( Graphics2D ) g;
+		// Table header background
+		GradientPaint bgPaint = new GradientPaint (0, 1, topColor, 0, height - 1, botColor);
+		g2d.setPaint(bgPaint);
+		g2d.fillRect(0, 1, width, height - 1);
-		 // Header top and bottom lines
+		// Header top and bottom lines
-		 //g2d.setColor(headerTopLine);
+		//g2d.setColor(headerTopLine);
 		// g2d.drawLine( 0, 0, width, 0);
-	 }
+	}
-	 final public static void drawHorizontalBar(Graphics g, int width, int height){
+	final public static void drawHorizontalBar(Graphics g, int width, int height){
-		 Graphics2D g2d = ( Graphics2D ) g;
+		Graphics2D g2d = ( Graphics2D ) g;
-	     GradientPaint paint = new GradientPaint(0, 1, Style.topColor, 0, height, Style.botColor);
+		GradientPaint paint = new GradientPaint(0, 1, Style.topColor, 0, height, Style.botColor);
-	     g2d.setPaint(paint);
+		g2d.setPaint(paint);
-	     g2d.fillRect(0, 0, width, height);
+		g2d.fillRect(0, 0, width, height);
-	 }
+	}
-	 final public static void drawLightHorizontalBar(Graphics g, int width, int height){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 g2d.setPaint ( new GradientPaint ( 0, 1, Color.WHITE, 0, height, new Color ( 223, 223, 223 ) ) );
-	     g2d.fillRect(0, 0, width, height);
-	 }
-	 final public static void drawDarkHorizontalBar(Graphics g, int width, int height){
-		 Graphics2D g2d = ( Graphics2D ) g;
-	     GradientPaint paint = new GradientPaint(0, 1, Style.topColor.darker(), 0, height, Style.botColor.darker());
-	     g2d.setPaint(paint);
-	     g2d.fillRect(0, 0, width, height);
-	 }
-	 final public static void drawTreeSelection(Graphics g, int height, Rectangle rect){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 g2d.setPaint ( new GradientPaint ( 0, 1, Style.topLineColor, 0, height, Style.bottomColor ) );
-         g2d.fill(rect);
-         g2d.setPaint(Style.topLineColor);
-         g2d.draw(rect);
-	 }
-	 final public static void drawVerticalBar(Graphics g, int width, int height){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 GradientPaint paint = new GradientPaint(0, 1, Style.botColor, 0, height, Style.topColor);
-	     g2d.setPaint(paint);
-	     g2d.fillRect(0, 0, width, height);
-	 }
-	 final public static void drawVerticalScrollTrack( Graphics g, Rectangle thumbRect, int width,int height,
-			 boolean drawBorder ){
-		 if (drawBorder){
-	         Graphics2D g2d = ( Graphics2D ) g;
-	         g2d.setPaint ( scrollBg );
-	         g2d.fillRect ( 0, 0, width, height );
-	         int vBorder = width - 1; //maybe 0
-	         g2d.setColor ( scrollBorder );
-	         g2d.drawLine ( vBorder, 0, vBorder, height - 1 );
-	      }
-	 }
-	 final public static void drawHorizontalScrollTrack( Graphics g, Rectangle thumbRect, int width,int height,
-			 boolean drawBorder ){
-		 if (drawBorder){
-	         Graphics2D g2d = ( Graphics2D ) g;
-	         g2d.setPaint ( scrollBg );
-	         g2d.fillRect ( 0, 0, width, height );
-	         g2d.setColor ( scrollBorder );
-	         g2d.drawLine ( 0, 0, width, 0 );
-	      }
-	 }
-	 final public static void drawVerticalScrollBar( Graphics g, Rectangle thumbRect, int width, boolean isDragging){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 Color leftColor = isDragging ? scrollSelGradientLeft : scrollGradientLeft;
-	     Color rightColor = isDragging ? scrollSelGradientRight : scrollGradientRight;
-		 g2d.setPaint ( new GradientPaint ( 3, 0, leftColor, width - 4, 0, rightColor ) );
-         g2d.fillRoundRect ( thumbRect.x + 2, thumbRect.y + 1, thumbRect.width - 4, thumbRect.height - 3, 0, 0);
-         g2d.setPaint ( scrollBarBorder );
-         g2d.drawRoundRect ( thumbRect.x + 2, thumbRect.y + 1, thumbRect.width - 4, thumbRect.height - 3, 0, 0);
-	 }
-	 final public static void drawHorizontalScrollBar( Graphics g, Rectangle thumbRect, int width, boolean isDragging){
-		 Graphics2D g2d = ( Graphics2D ) g;
-		 Color leftColor = isDragging ? scrollSelGradientLeft : scrollGradientLeft;
-	     Color rightColor = isDragging ? scrollSelGradientRight : scrollGradientRight;
-	     g2d.setPaint ( new GradientPaint ( 0, thumbRect.y + 2, leftColor, 0, thumbRect.y + 2 + thumbRect.height - 4, rightColor ) );
-         g2d.fillRoundRect ( thumbRect.x + 1, thumbRect.y + 2, thumbRect.width - 3, thumbRect.height - 4, 0, 0);
-         g2d.setPaint ( scrollBarBorder );
-         g2d.drawRoundRect ( thumbRect.x + 1, thumbRect.y + 2, thumbRect.width - 3, thumbRect.height - 4, 0, 0);
-	 }
-	 public static class TitleLabel extends JLabel {
-			private static final long serialVersionUID = 1L;
-			public TitleLabel(String text){
-				super(text.toUpperCase());
-				UIUtils.setBoldFont(this);
-				setVerticalTextPosition(JLabel.CENTER);
-				setHorizontalTextPosition(JLabel.CENTER);
-				setHorizontalAlignment(JLabel.CENTER);
-				setForeground(Style.headerFg);
-			}
-			@Override
-			public void paint ( Graphics g){
-				Graphics2D g2d = ( Graphics2D ) g;
-				if(headerBgPaint == null)
-					headerBgPaint = new GradientPaint ( 0, 1, Style.headerBg,
-							0, getHeight()-1, Style.headerBgBot);
-				g2d.setPaint ( headerBgPaint );
-				g2d.fillRect ( 0, 1, getWidth(), getHeight() - 1 );
-				g2d.setColor ( Style.headerTopLine);
-				g2d.drawLine ( 0, 0, getWidth (), 0 );
-				super.paint(g);
-			}
-	 }
-	 public static class TitleButton extends JButton {
-		 private static final long serialVersionUID = 1L;
-		 public TitleButton(String text){
-			 super(text.toUpperCase());
-			 //btn.setOpaque(true);
-			 //btn.setBackground(headerBg);
-			 setForeground(Style.headerFg);
-			 UIUtils.setBoldFont(this);
-			 UIUtils.setRolloverDecoratedOnly(this,true);
-			 UIUtils.setLeftRightSpacing(this, 4);
-			 UIUtils.setRound(this, 0);
-			 UIUtils.setUndecorated(this, true);
-			 UIUtils.setShadeWidth(this, 2);
-			 setVerticalTextPosition(JLabel.CENTER);
-			 setHorizontalTextPosition(JLabel.CENTER);
-			 setHorizontalAlignment(JLabel.CENTER);
-		 }
-		 @Override
+	final public static void drawVerticalScrollTrack( Graphics g, Rectangle thumbRect, int width,int height,
-		 public void paint( Graphics g){
+			boolean drawBorder ){
+		if (drawBorder){
-			 Graphics2D g2d = ( Graphics2D ) g;
+			Graphics2D g2d = ( Graphics2D ) g;
-			 if(headerBgPaint == null)
-				 headerBgPaint = new GradientPaint ( 0, 1, Style.headerBg,
-						 0, getHeight()-1, Style.headerBgBot);
-			 g2d.setPaint ( headerBgPaint );
+			g2d.setPaint ( scrollBg );
-			 g2d.fillRect ( 0, 1, getWidth (), getHeight () - 1 );
+			g2d.fillRect ( 0, 0, width, height );
+			int vBorder = width - 1; //maybe 0
+			g2d.setColor ( scrollBorder );
+			g2d.drawLine ( vBorder, 0, vBorder, height - 1 );
+		}
+	}
+	final public static void drawHorizontalScrollTrack( Graphics g, Rectangle thumbRect, int width,int height,
+			boolean drawBorder ){
+		if (drawBorder){
-			 // Header top and bottom lines
+			Graphics2D g2d = ( Graphics2D ) g;
+			g2d.setPaint ( scrollBg );
+			g2d.fillRect ( 0, 0, width, height );
-			 g2d.setColor ( Style.headerTopLine );
+			g2d.setColor ( scrollBorder );
-			 g2d.drawLine ( 0, 0, getWidth (), 0 );
+			g2d.drawLine ( 0, 0, width, 0 );
-			 super.paint(g);
-		 }
+		}
-	 }
+	}
+	final public static void drawVerticalScrollBar( Graphics g, Rectangle thumbRect, int width, boolean isDragging){
-	/*
+		Graphics2D g2d = ( Graphics2D ) g;
+		Color leftColor = isDragging ? scrollSelGradientLeft : scrollGradientLeft;
+		Color rightColor = isDragging ? scrollSelGradientRight : scrollGradientRight;
-	 * Creates a plain flat JButton/Header Button with current Style background color
+		g2d.setPaint ( new GradientPaint ( 3, 0, leftColor, width - 4, 0, rightColor ) );
+		g2d.fillRoundRect ( thumbRect.x + 2, thumbRect.y + 1, thumbRect.width - 4, thumbRect.height - 3, 0, 0);
+		g2d.setPaint ( scrollBarBorder );
+		g2d.drawRoundRect ( thumbRect.x + 2, thumbRect.y + 1, thumbRect.width - 4, thumbRect.height - 3, 0, 0);
+	}
+	final public static void drawHorizontalScrollBar( Graphics g, Rectangle thumbRect, int width, boolean isDragging){
+		Graphics2D g2d = ( Graphics2D ) g;
+		Color leftColor = isDragging ? scrollSelGradientLeft : scrollGradientLeft;
+		Color rightColor = isDragging ? scrollSelGradientRight : scrollGradientRight;
+		g2d.setPaint ( new GradientPaint ( 0, thumbRect.y + 2, leftColor, 0, thumbRect.y + 2 + thumbRect.height - 4, rightColor ) );
+		g2d.fillRoundRect ( thumbRect.x + 1, thumbRect.y + 2, thumbRect.width - 3, thumbRect.height - 4, 0, 0);
+		g2d.setPaint ( scrollBarBorder );
+		g2d.drawRoundRect ( thumbRect.x + 1, thumbRect.y + 2, thumbRect.width - 3, thumbRect.height - 4, 0, 0);
+	}
+	public static class TitleLabel extends JLabel {
+		private static final long serialVersionUID = 1L;
+		public TitleLabel(String text){
+			setText(text);
+			UIUtils.setBoldFont(this);
+			setVerticalTextPosition(JLabel.CENTER);
+			setHorizontalTextPosition(JLabel.CENTER);
+			setHorizontalAlignment(JLabel.CENTER);
+			setForeground(Style.headerFg);
+		}
-	 */
+		@Override
+		public void setText(String text){
+			super.setText(text.toUpperCase());
+		}
+		@Override
+		public void paint ( Graphics g){
+			Graphics2D g2d = ( Graphics2D ) g;
+			if(headerBgPaint == null)
+				headerBgPaint = new GradientPaint ( 0, 1, Style.headerBg,
+						0, getHeight()-1, Style.headerBgBot);
+			g2d.setPaint ( headerBgPaint );
+			g2d.fillRect ( 0, 1, getWidth(), getHeight() - 1 );
+			g2d.setColor ( Style.headerTopLine);
+			g2d.drawLine ( 0, 0, getWidth (), 0 );
+			super.paint(g);
+		}
+	}
+	public static class TitleButton extends JButton {
+		private static final long serialVersionUID = 1L;
-	 final public static JButton createHeaderButton(String text, ActionListener al){
+		public TitleButton(String text, ActionListener al){
+			setText(text);
+			//btn.setOpaque(true);
+			//btn.setBackground(headerBg);
+			setForeground(Style.headerFg);
+			UIUtils.setBoldFont(this);
-		final TitleButton btn = new TitleButton(text);
+			UIUtils.setRolloverDecoratedOnly(this,true);
+			UIUtils.setLeftRightSpacing(this, 4);
+			UIUtils.setRound(this, 0);
+			UIUtils.setUndecorated(this, true);
+			UIUtils.setShadeWidth(this, 2);
+			setVerticalTextPosition(JLabel.CENTER);
+			setHorizontalTextPosition(JLabel.CENTER);
+			setHorizontalAlignment(JLabel.CENTER);
-		if(al != null)
+			if(al != null)
-			btn.addActionListener(al);
+				addActionListener(al);
+		}
+		public TitleButton(String text){
+			this(text, null);
+		}
+		@Override
+		public void setText(String text){
+			super.setText(text.toUpperCase());
+		}
+		@Override
+		public void paint( Graphics g){
+			Graphics2D g2d = ( Graphics2D ) g;
+			if(headerBgPaint == null)
+				headerBgPaint = new GradientPaint ( 0, 1, Style.headerBg,
+						0, getHeight()-1, Style.headerBgBot);
+			g2d.setPaint ( headerBgPaint );
+			g2d.fillRect ( 0, 1, getWidth (), getHeight () - 1 );
+			// Header top and bottom lines
+			g2d.setColor ( Style.headerTopLine );
+			g2d.drawLine ( 0, 0, getWidth (), 0 );
-		return btn;
+			super.paint(g);
+		}
 	}
-	 /* ToolBar Related Methods */
+	/* ToolBar Related Methods */
 	// This is for Menu Items
 	final public static JButton createMenuButton(String title){
 		JButton btn = new JButton(title);
 		btn.setFocusable(false);
 		btn.setOpaque(false);
-	    UIUtils.setRolloverDecoratedOnly(btn, true);
+		UIUtils.setRolloverDecoratedOnly(btn, true);
-	    UIUtils.setRound(btn, 0);
+		UIUtils.setRound(btn, 0);
-	    UIUtils.setLeftRightSpacing(btn, 5);
+		UIUtils.setLeftRightSpacing(btn, 5);
-	    UIUtils.setShadeWidth(btn, 0);
+		UIUtils.setShadeWidth(btn, 0);
-	    UIUtils.setInnerShadeWidth(btn, 0);
+		UIUtils.setInnerShadeWidth(btn, 0);
 		return btn;
 	}
 	// This is for ToolButtons without Popup
 	final public static JPanel createToolPanel(String text, String iconname,final ActionListener onClick){
 		final JPanel pan = new JPanel(new VerticalFlowLayout(FlowLayout.CENTER, 0, 0));
@@ -327,63 +273,62 @@ public enum Style {
 		return pan;
 	}
-	 /* SideBar Related Methods */
+	/* SideBar Related Methods */
 	// This is for ToolButtons with Popup
-	final public static JButton createToolButton(String iconname){
+	final public static JButton createToolButton(String tooltip, String iconname, ActionListener al){
 		final JButton btn = new JButton(Icon.icon(iconname));
+		btn.setToolTipText(tooltip);
+		UIUtils.setRolloverDecoratedOnly(btn,true);
+		UIUtils.setLeftRightSpacing(btn, 0);
 		btn.setFocusable(false);
-		btn.setToolTipText(iconname.toUpperCase());
+		if(al != null)
-		btn.setOpaque(false);
+			btn.addActionListener(al);
-	    UIUtils.setLeftRightSpacing(btn, 5);
-	    UIUtils.setRound(btn, 0);
-	    UIUtils.setShadeWidth(btn, 0);
-	    UIUtils.setUndecorated(btn, true);
 		return btn;
 	}
 	// This is for ToolButtons without Popup
 	public static JButton createPopUpToolButton(String iconname){
 		JButton btn = new JButton(Icon.icon(iconname));
 		btn.setFocusable(false);
 		btn.setToolTipText(iconname.toUpperCase());
 		btn.setOpaque(false);
-	    UIUtils.setLeftRightSpacing(btn, 4);
+		UIUtils.setLeftRightSpacing(btn, 4);
-	    UIUtils.setRound(btn, 0);
+		UIUtils.setRound(btn, 0);
-	    UIUtils.setUndecorated(btn, true);
+		UIUtils.setUndecorated(btn, true);
 		return btn;
 	}
 	static int currentIndex = 1;
 	public static void viewButton(String text, String ic){
 		final int id = Integer.valueOf(currentIndex);
 		currentIndex += 1;
 		JButton btn = new JButton(text,Icon.icon(ic));
 		UIUtils.setDrawFocus(btn, false);
-        UIUtils.setShadeWidth(btn, 0);
+		UIUtils.setShadeWidth(btn, 0);
-        //UIUtils.setRound(btn, 0);
+		//UIUtils.setRound(btn, 0);
 		viewGroup.add(btn);
 		btn.addActionListener(new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent arg0) {
 				Content.toggleView(id);
 			}
-        });
+		});
 	}
 	final public static JPanel createButtonToolBarPanel(){
 		JPanel tools = new JPanel(new ToolbarLayout(ToolbarLayout.HORIZONTAL)){
 			private static final long serialVersionUID = 1L;
 			@Override
 			public void paintComponent(Graphics g){
-		    	Style.drawHorizontalBar(g, getWidth (), getHeight ());
+				Style.drawHorizontalBar(g, getWidth (), getHeight ());
-		        g.setColor(Color.GRAY);
+				g.setColor(Color.GRAY);
-		        g.drawLine(0, getHeight()-1, getWidth(), getHeight()-1);
+				g.drawLine(0, getHeight()-1, getWidth(), getHeight()-1);
 			}
 		};
 		return tools;
 	}
 	public static JPanel createButtonToolBar(ActionListener al, String[] list){
 		JPanel tools = createButtonToolBarPanel();
 		for(int i=0;i< list.length-1; i++){
@@ -391,103 +336,13 @@ public enum Style {
 				if(i%2 != 0)
 					continue;
 			final JButton btn = new JButton(Icon.icon(list[i+1]));
-		    UIUtils.setRolloverDecoratedOnly(btn,true);
+			UIUtils.setRolloverDecoratedOnly(btn,true);
-		    UIUtils.setLeftRightSpacing(btn, 0);
+			UIUtils.setLeftRightSpacing(btn, 0);
-		    btn.setFocusable(false);
+			btn.setFocusable(false);
-		    btn.setToolTipText(list[i]);
+			btn.setToolTipText(list[i]);
-		    btn.addActionListener(al);
+			btn.addActionListener(al);
-		    tools.add(btn);
+			tools.add(btn);
 		}
 		return tools;
 	}
-	/* Explorer Related Methods */
-	final public static JButton createExplorerToolButton(String text,String iconname, ActionListener al){
-		final JButton btn = new JButton(Icon.icon(iconname));
-	    UIUtils.setRolloverDecoratedOnly(btn,true);
-	    UIUtils.setLeftRightSpacing(btn, 0);
-	    btn.setFocusable(false);
-	    btn.setToolTipText(text);
-	    if(al != null)
-			btn.addActionListener(al);
-		return btn;
-	}
-	final private static ButtonPopup createExplorerToolMenu(JButton btn, String title){
-		final ButtonPopup menu = new ButtonPopup(btn, PopupWay.upRight);
-		menu.setRound(0);
-		menu.setShadeWidth(7);
-		final JPanel content = new JPanel(new BorderLayout());
-		content.setOpaque(false);
-		UIUtils.setRound(btn, 0);
-		UIUtils.setLeftRightSpacing(btn, 0);
-	    content.add(new TitleLabel(title), BorderLayout.NORTH);
-	    menu.setContent(content);
-		return menu;
-	}
-	final public static JButton createExplorerToolPopButton(final String text, final String icon,
-			final JPanel panel, final String finishText, final ActionListener onClick){
-		 final JButton btn = createExplorerToolButton(text, icon, null);
-		 final ButtonPopup menu = createExplorerToolMenu(btn, text);
-		 final JButton finish = createHeaderButton(finishText, null);
-		 finish.setToolTipText(text);
-		 final JPanel hoz = new JPanel(new VerticalFlowLayout(10));
-		 panel.setOpaque(false);
-		 UIUtils.setMargin(hoz, new Insets(10,10,10,10));
-		 hoz.setOpaque(false);
-		 hoz.add(new CenterPanel(panel));
-		 Box box = Box.createHorizontalBox();
-		 box.add(Box.createHorizontalGlue());
-		 box.add(finish);
-		 hoz.add(box);
-		 menu.getContentPanel().add(new CenterPanel(hoz), BorderLayout.CENTER);
-	     finish.addActionListener(new ActionListener(){
-			@Override
-			public void actionPerformed(ActionEvent event) {
-				menu.hidePopup();
-				if(onClick != null)
-					onClick.actionPerformed(event);
-			}
-	     });
-		return btn;
-	}
-	final public static JButton createExplorerToolPopButton(final String text, final String icon,
-			JTextField field, final ActionListener onClick){
-		final JButton btn = createExplorerToolButton(text, icon, null);
-		final ButtonPopup menu = createExplorerToolMenu(btn, text);
-		final JButton finish = createHeaderButton("OK", null);
-		finish.setToolTipText(text);
-	    final JPanel hoz = new JPanel(new HorizontalFlowLayout(10));
-		field.setPreferredSize(new Dimension(240,25));
-		UIUtils.setMargin(hoz, new Insets(10,10,10,10));
-		hoz.setOpaque(false);
-		hoz.add(new CenterPanel(field));
-		Box box = Box.createHorizontalBox();
-		box.add(Box.createHorizontalGlue());
-		box.add(finish);
-		hoz.add(box);
-		menu.getContentPanel().add(new CenterPanel(hoz), BorderLayout.CENTER);
-		finish.addActionListener(new ActionListener(){
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				if(onClick != null)
-					onClick.actionPerformed(arg0);
-				menu.hidePopup();
-			}
-	    });
-		return btn;
-	}
-	public static JButton TreeButton(String iconName){
-		 JButton btn = new JButton(Icon.icon(iconName));
-		 btn.setVisible(false);
-		 btn.setOpaque(false);
-		 btn.setFocusable(false);
-		 UIUtils.setRound(btn, 0);
-		 //UIUtils.setShadeWidth(btn, 0);
-		 //UIUtils.setUndecorated(btn, true);
-		 return btn;
-	}
 }

IDE/ToolBar.java CHANGED Viewed

@@ -1,15 +1,19 @@
+import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FileDialog;
 import java.awt.FlowLayout;
 import java.awt.Graphics;
 import java.awt.Insets;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.lang.ProcessBuilder.Redirect;
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
@@ -30,6 +34,7 @@ final public class ToolBar extends JPanel {
 	SearchBar searchBar;
 	ProcessBuilder pb;
 	Process runningProcess;
+	OptionsPanel optionsPanel;
 	public ToolBar(){
 		super(new ToolbarLayout());
@@ -62,12 +67,12 @@ final public class ToolBar extends JPanel {
         addSpace();
         addSeparator();
         initView();
+        setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
 	}
 	@Override
 	public void paintComponent(Graphics g){
 		Style.drawHorizontalBar(g, getWidth (), getHeight ());
-		Style.drawBottomBorder(g, getWidth (), getHeight ());
 	}
 	void initSearch(){
@@ -79,29 +84,41 @@ final public class ToolBar extends JPanel {
 	}
 	void initAbout(){
-		add(Style.createToolPanel("", "sabout", null));
+		add(Style.createToolPanel("", "sabout", new ActionListener(){
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
-		UIUtils.setUndecorated(Style.btnMap.get("sabout"), true);
+				JDialog dialog = new JDialog(Frame.getInstance(), "About", false);
-        final ButtonPopup menu = new ButtonPopup(Style.btnMap.get("sabout"), PopupWay.downRight);
-        menu.setRound(0);
+				dialog.setResizable(false);
+				dialog.getContentPane().setLayout(new BorderLayout());
-        final JPanel popupContent = new JPanel (new VerticalFlowLayout(5, 10));
+				final JPanel popupContent = new JPanel (new VerticalFlowLayout(5, 10));
-        final JButton licenseBtn = new JButton("Apache License v2.0");
+				final JButton licenseBtn = new JButton("Apache License v2.0");
-        final JPanel author = new JPanel(new HorizontalFlowLayout());
+				final JPanel author = new JPanel(new HorizontalFlowLayout());
-        final JPanel hoz = 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"+Main.version)));
-        popupContent.add(new JSeparator(SwingConstants.HORIZONTAL));
+				popupContent.add(new JSeparator(SwingConstants.HORIZONTAL));
-        author.setOpaque(false);
+				author.setOpaque(false);
-        author.add(new JLabel("Created by: pyros2097"));
+				author.add(new JLabel("Created by: pyros2097"));
-        author.add(licenseBtn);
+				author.add(licenseBtn);
-        popupContent.add(author);
+				popupContent.add(author);
-        popupContent.add(new JSeparator(SwingConstants.HORIZONTAL));
+				popupContent.add(new JSeparator(SwingConstants.HORIZONTAL));
-        popupContent.add(new JLabel("", Icon.icon("slibGDX"), JLabel.LEADING));
+				popupContent.add(new JLabel("", Icon.icon("slibGDX"), JLabel.LEADING));
-        popupContent.add(new JLabel("", Icon.icon("sweblaf"), JLabel.LEADING));
+				popupContent.add(new JLabel("", Icon.icon("sweblaf"), JLabel.LEADING));
-        hoz.setOpaque(false);
+				hoz.setOpaque(false);
-        hoz.add(new JLabel("", Icon.icon("shierologo"), JLabel.LEADING));
+				hoz.add(new JLabel("", Icon.icon("shierologo"), JLabel.LEADING));
-        hoz.add(new JLabel("", Icon.icon("stexturepacker"), JLabel.LEADING));
+				hoz.add(new JLabel("", Icon.icon("stexturepacker"), JLabel.LEADING));
-        popupContent.add(hoz);
+				popupContent.add(hoz);
-        popupContent.setOpaque(false);
+				UIUtils.setUndecorated(popupContent, false);
+				UIUtils.setMargin(popupContent, new Insets(0,0,0,0));
+				UIUtils.setDrawSides(popupContent, false, false, false, false);
-        menu.setContent (popupContent);
+				dialog.getContentPane().add(popupContent);
+				dialog.pack();
+				dialog.setSize(525, 500);
+				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());
+				dialog.setVisible(true);
+			}
+		}));
 	}
 	void initFile(){
@@ -212,10 +229,20 @@ final public class ToolBar extends JPanel {
 	}
 	void initOptions(){
+        optionsPanel = new OptionsPanel();
 	    add(Style.createToolPanel("Options", "options", new ActionListener(){
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				JDialog dialog = new JDialog(Frame.getInstance(), "Options", false);
+				dialog.setResizable(false);
+				dialog.getContentPane().setLayout(new BorderLayout());
-				Content.toggleOptions();
+				dialog.getContentPane().add(optionsPanel);
+				dialog.pack();
+				dialog.setSize(525, 500);
+				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());
+				dialog.setVisible(true);
 			}
 	    }));

Panel/ActorPanel.java CHANGED Viewed

@@ -1,8 +1,13 @@
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
+import web.laf.lite.widget.CenterPanel;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 public class ActorPanel extends BaseList {
@@ -11,13 +16,21 @@ public class ActorPanel extends BaseList {
 	String[] btns = new String[]{
 			"Cut", "cut", "Copy", "copy", "Paste", "paste", "Delete", "trash"
 	};
+	private JComboBox<String> groupCombo = BaseTable.createComboBox();
 	public static Actor copiedActor = null;
+	public static Actor cutActor = null;
 	public ActorPanel(){
 		super("Actors", "");
-		add(Style.createButtonToolBar(this, btns));
+		JPanel tools = Style.createButtonToolBar(this, btns);
+		groupCombo.addItem("Root");
+		groupCombo.setPreferredSize(new Dimension(90, 17));
+		tools.add(new CenterPanel(groupCombo, false, true));
+		add(tools);
 		add(scrollPane);
+		if(Content.sceneFileExists())
+			setHeaderText(Content.getSceneFile());
 	}
 	public void addActor(String actorName){
@@ -33,6 +46,19 @@ public class ActorPanel extends BaseList {
 		unlock();
 	}
+	public void addGroup(String groupName){
+		groupCombo.addItem(groupName);
+	}
+	public void removeGroup(String groupName){
+		// must check for root
+		for(int i=0;i<groupCombo.getItemCount();i++)
+			if(groupCombo.getItemAt(i).equals(groupCombo.getSelectedItem())){
+				groupCombo.removeItem(groupName);
+				break;
+			}
+	}
 	@Override
 	public void clear(){
 		lock();
@@ -61,21 +87,26 @@ public class ActorPanel extends BaseList {
 		lock();
 		switch(((JButton)e.getSource()).getToolTipText()){
 		case "Cut":
-			copiedActor = SceneEditor.selectedActor;
+			cutActor = SceneEditor.selectedActor;
+			copiedActor = null;
 			listModel2.removeElement(SceneEditor.selectedActor.getName());
 			Stage.removeActor(SceneEditor.selectedActor);
 			break;
 		case "Copy":
-			//need to make new copy
-			//copiedActor = selectedActor;
+			String line = Stage.json.toJson(SceneEditor.selectedActor);
+			copiedActor = Stage.json.fromJson(Actor.class, line);
+			cutActor = null;
 			break;
 		case "Paste":
+			if(cutActor != null){
+				Content.studioPanel.setName(cutActor);
+				cutActor = null;
+			}
 			if(copiedActor != null){
+				copiedActor = Stage.json.fromJson(Actor.class, Stage.json.toJson(SceneEditor.selectedActor));
-				copiedActor.setName(copiedActor.getName()+"1");
+				Content.studioPanel.setName(copiedActor);
-				Stage.addActor(copiedActor, Stage.mouse.x, Stage.mouse.y);
-				addActor(copiedActor.getName());
 			}
 			break;
@@ -87,4 +118,8 @@ public class ActorPanel extends BaseList {
 		}
 		unlock();
 	}
+	public void setHeaderText(String text){
+		header.setText(text);
+	}
 }

Panel/BaseList.java CHANGED Viewed

@@ -8,6 +8,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.swing.AbstractListModel;
+import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -19,7 +20,7 @@ import javax.swing.event.ListSelectionListener;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
-public abstract class BaseList extends JPanel  implements ListSelectionListener, ActionListener {
+public abstract class BaseList extends JPanel implements ListSelectionListener, ActionListener {
 	private static final long serialVersionUID = 1L;
 	protected JList<String> list;
 	protected DefaultListModel<String> listModel;
@@ -35,12 +36,14 @@ public abstract class BaseList extends JPanel  implements ListSelectionListener,
 		list = new JList<String>(listModel);
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		list.addListSelectionListener(this);
+		UIUtils.setDecorateSelection(list, false);
 		header = new Style.TitleLabel(title);
 		add(header);
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
 		UIUtils.setDrawBorder(scrollPane, false);
 		add(scrollPane);
+		setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
 	}
 	BaseList(String title, boolean dontAddScroll){
@@ -56,6 +59,7 @@ public abstract class BaseList extends JPanel  implements ListSelectionListener,
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
 		UIUtils.setDrawBorder(scrollPane, false);
+		setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
 	}
 	BaseList(String title, String... items){
@@ -72,6 +76,7 @@ public abstract class BaseList extends JPanel  implements ListSelectionListener,
 		scrollPane.setPreferredSize(new Dimension(200, 175));
 		UIUtils.setDrawBorder(scrollPane, false);
 		add(scrollPane);
+		setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
 	}
 	@SuppressWarnings("unchecked")
@@ -88,6 +93,7 @@ public abstract class BaseList extends JPanel  implements ListSelectionListener,
 		scrollPane = new JScrollPane(list);
 		scrollPane.setPreferredSize(new Dimension(200, 175));
 		UIUtils.setDrawBorder(scrollPane, false);
+		setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
 	}
 	public void enable(){
@@ -187,4 +193,4 @@ class SortedListModel extends AbstractListModel {
 		}
 		return removed;
 	}
-}
+}

Panel/BaseTable.java CHANGED Viewed

@@ -34,6 +34,8 @@ import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
 import web.laf.lite.layout.ToolbarLayout;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -71,7 +73,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 	};
 	protected final JScrollPane scrollPane;
 	protected final List<TableCellEditor> editors = new ArrayList<TableCellEditor>(3);
-	public final JButton headerButton;
+	protected final JButton headerButton;
 	public BaseTable(String title, DefaultTableModel model, DefaultTableCellRenderer renderer){
 		super(new VerticalFlowLayout());
@@ -93,7 +95,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		tableModel.setColumnCount(2);
 		tableModel.addTableModelListener(this);
 		clear();
-		headerButton = Style.createHeaderButton(title, this);
+		headerButton = new Style.TitleButton(title, this);
 		if(!title.isEmpty()){
 			add(headerButton);
 		}
@@ -161,6 +163,10 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		}
 	}
+	public void setProperty(String name, String value){
+	}
 	public void updateProperty(String key, String value, int row){
 		lock();
 		tableModel.setValueAt(value, row, 1);
@@ -185,6 +191,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(spinner, 0);
 		UIUtils.setRound(spinner, 0);
 		UIUtils.setDrawFocus(spinner, false);
+		spinner.setFocusable(false);
 		return spinner;
 	}
@@ -195,6 +202,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(spinner, 0);
 		UIUtils.setRound(spinner, 0);
 		UIUtils.setDrawFocus(spinner, false);
+		spinner.setFocusable(false);
 		return spinner;
 	}
@@ -203,6 +211,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(tf, 0);
 		UIUtils.setRound(tf, 0);
 		UIUtils.setDrawFocus(tf, false);
+		tf.setFocusable(false);
 		return new DefaultCellEditor(tf);
 	}
@@ -211,6 +220,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(tf, 0);
 		UIUtils.setRound(tf, 0);
 		UIUtils.setDrawFocus(tf, false);
+		tf.setFocusable(false);
 		return tf;
 	}
@@ -219,6 +229,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(tf, 0);
 		UIUtils.setRound(tf, 0);
 		UIUtils.setDrawFocus(tf, false);
+		tf.setFocusable(false);
 		return new DefaultCellEditor(tf);
 	}
@@ -227,6 +238,7 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		UIUtils.setShadeWidth(combo, 0);
 		UIUtils.setRound(combo, 0);
 		UIUtils.setDrawFocus(combo, false);
+		combo.setFocusable(false);
 		return combo;
 	}
@@ -242,11 +254,13 @@ public abstract class BaseTable extends JPanel implements ActionListener, TableM
 		return new DefaultCellEditor(new JComboBox<String>(new String[]{"false", "true"}));
 	}
-	public static TableCellEditor createCheckBoxEditor(){
+	public static DefaultCellEditor createTouchableEditor(){
+		return new DefaultCellEditor(new JComboBox<String>(new String[]{Touchable.enabled.toString()
-		return new CheckBoxEditor();
+				, Touchable.disabled.toString(), Touchable.childrenOnly.toString()}));
 	}
-	public void setProperty(String name, String value){
+	public static TableCellEditor createCheckBoxEditor(){
+		return new CheckBoxEditor();
 	}
 }
@@ -487,7 +501,6 @@ class SpinnerIntegerEditor extends AbstractCellEditor implements TableCellEditor
     public SpinnerIntegerEditor() {
         spinner = BaseTable.createSpinnerInteger();
         spinner.setBorder(BorderFactory.createEmptyBorder());
-       // ((DefaultEditor) spinner.getEditor()).getTextField().setEnabled(false);
         ((DefaultEditor) spinner.getEditor()).getTextField().setEditable(false);
     }

Panel/ConsolePanel.java CHANGED Viewed

@@ -19,6 +19,7 @@ import javax.swing.SwingUtilities;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -42,7 +43,7 @@ public class ConsolePanel extends JPanel implements ActionListener {
 		UIUtils.setMargin(this, new Insets(0,0,0,0));
 	    UIUtils.setUndecorated(this, true);
         consoleAreaPane.setPreferredSize(new Dimension(500, 250));
-		add(Style.createHeaderButton("Console", this));
+		add(new Style.TitleButton("Console", this));
 		setVisible(false);
         add(consoleAreaPane);
         if(Content.projectExists())

Panel/DashPanel.java CHANGED Viewed

@@ -11,6 +11,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import com.badlogic.gdx.Gdx;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -27,7 +28,7 @@ public class DashPanel extends JPanel {
 		UIUtils.setShadeWidth(this, 0);
 		UIUtils.setRound(this, 0);
 		setBackground(Color.black);
-		add(Style.createHeaderButton("DashBoard", null));
+		add(new Style.TitleButton("DashBoard", null));
 		label = new JLabel();
 		label.setBackground(Color.black);
 		label.setVerticalTextPosition(JLabel.CENTER);

Panel/EffectPanel.java CHANGED Viewed

@@ -1,6 +1,8 @@
 import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
+import web.laf.lite.utils.UIUtils;
 public class EffectPanel extends BaseTable {
 	private static final long serialVersionUID = 1L;
@@ -21,6 +23,7 @@ public class EffectPanel extends BaseTable {
 	public EffectPanel(){
 		super("Effects");
+		UIUtils.setUndecorated(this, true);
 		editors.add(new DefaultCellEditor(effectComboBox));
 		editors.add(createNumberField());
 		editors.add(new DefaultCellEditor(durationComboBox));

Panel/OptionsPanel.java CHANGED Viewed

@@ -1,24 +1,28 @@
-import java.awt.Color;
 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.SpringLayout;
-import javax.swing.border.TitledBorder;
+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.AlignPanel;
 import web.laf.lite.utils.SpringUtils;
+import web.laf.lite.utils.UIUtils;
 import web.laf.lite.widget.WebSwitch;
 public class OptionsPanel extends JPanel implements ActionListener {
 	private static final long serialVersionUID = 1L;
 	JPanel row1 = new JPanel(new HorizontalFlowLayout());
@@ -26,22 +30,23 @@ public class OptionsPanel extends JPanel implements ActionListener {
 	JPanel content1 = new JPanel(new VerticalFlowLayout());
 	JPanel content2 = new JPanel(new VerticalFlowLayout());
+	JPanel conten34Border = new JPanel(new VerticalFlowLayout());
 	JPanel content34 = new JPanel(new HorizontalFlowLayout());
 	JPanel content3 = new JPanel(new VerticalFlowLayout());
 	JPanel content4 = new JPanel(new VerticalFlowLayout());
+	JPanel conten5Border = new JPanel(new VerticalFlowLayout());
 	JPanel content5 = new JPanel(new SpringLayout());
+	JButton packButton;
 	public OptionsPanel(){
-		super(new VerticalFlowLayout());
+		super(new VerticalFlowLayout(0, 10));
+		UIUtils.setUndecorated(this, true);
+		createHeader(content1, "ToolBar");
+		createHeader(content2, "SearchBar");
-		Font font = new JLabel().getFont().deriveFont(Font.BOLD, 12);
+		createHeader(conten34Border, "Editor");
-		content1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.black),
+		createHeader(conten5Border, "Texture Packer");
-				"ToolBar", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, font));
-		content2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.black),
-				"SearchBar", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, font));
-		content34.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.black),
-				"Editor", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, font));
-		content5.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.black),
-				"Texture Packer", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, font));
         WebSwitch left = new WebSwitch();
         WebSwitch right = new WebSwitch();
         WebSwitch status = new WebSwitch();
@@ -119,8 +124,9 @@ public class OptionsPanel extends JPanel implements ActionListener {
         menuItem(content4,codeFold, "Code Folding");
         menuItem(content4,showWhitespaces, "Show WhiteSpace");
         content34.add(content4);
-        row1.add(content34);
         add(row1);
+        conten34Border.add(content34);
+        add(conten34Border);
     	createRow(content5, "Encoding Format", new JComboBox<String>(new String[]{"RGBA8888", "RGBA4444", "RGB888", "RGB565",
     			"Alpha", "LuminanceAlpha", "Intensity"}));
@@ -152,8 +158,30 @@ public class OptionsPanel extends JPanel implements ActionListener {
     	createRow(content5, "ClampY", new JComboBox<String>());
     	SpringUtils.makeCompactGrid(content5, 6, 4, 10, 0, 10, 5);
+    	conten5Border.add(content5);
-    	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()){
+						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);
@@ -206,7 +234,6 @@ public class OptionsPanel extends JPanel implements ActionListener {
 				Content.editor.setWhitespaceVisible(showWhitespaces.isSelected());
 			}
         });
-        setVisible(false);
 	}
 	void createRow(JPanel content, String title, Component b){
@@ -221,12 +248,19 @@ public class OptionsPanel extends JPanel implements ActionListener {
 	void menuItem(JPanel content, final WebSwitch sw, String text){
 		final JLabel label = new JLabel("   "+text);
+		label.setFont(label.getFont().deriveFont(Font.BOLD));
 		JPanel pan = new JPanel(new ToolbarLayout());
 		pan.setOpaque(false);
 		pan.add(label, ToolbarLayout.START);
 		pan.add(sw, ToolbarLayout.END);
 		content.add(pan);
 	}
+	void createHeader(JPanel content, String title){
+		//content.setBackground(Color.white);
+		content.add(new Style.TitleLabel(title));
+		content.setBorder(BorderFactory.createLineBorder(Style.border));
+	}
 	@Override
 	public void actionPerformed(ActionEvent e) {

Panel/ProjectPanel.java CHANGED Viewed

@@ -1,11 +1,13 @@
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -59,7 +61,7 @@ public class ProjectPanel extends JPanel implements ActionListener, TableModelLi
         }
 	};
-	JButton moreBtn = new JButton("More");
+	JButton moreBtn;
 	static JLabel prjIcon = new JLabel();
 	static List<TableCellEditor> editors = new ArrayList<TableCellEditor>(3);
 	static JTextField versionField = new JTextField();
@@ -72,8 +74,10 @@ public class ProjectPanel extends JPanel implements ActionListener, TableModelLi
 	public ProjectPanel(){
 		super(new VerticalFlowLayout());
+		UIUtils.setUndecorated(this, true);
 		UIUtils.setShadeWidth(this, 0);
 		UIUtils.setRound(this, 0);
+		UIUtils.setDrawSides(this, false, false, false, false);
 		propTable.setTableHeader(null);
 		propTable.setDefaultRenderer(String.class, new BaseRenderer());
 		propTable.setShowGrid(true);
@@ -89,16 +93,28 @@ public class ProjectPanel extends JPanel implements ActionListener, TableModelLi
 		scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);
 		scrollPane.setPreferredSize(new Dimension(168, 48));
 		UIUtils.setDrawBorder(scrollPane, false);
-		add(Style.createHeaderButton("Project", this));
+		add(new Style.TitleButton("Project", this));
 		JPanel hoz1 = new JPanel(new HorizontalFlowLayout(0));
-		UIUtils.setUndecorated(hoz1, true);
 		hoz1.setBackground(Color.black);
 		hoz1.add(prjIcon);
 		hoz1.add(scrollPane);
 		add(hoz1);
+		moreBtn = new JButton("More");
 		UIUtils.setUndecorated(moreBtn, true);
 		UIUtils.setShadeWidth(moreBtn, 0);
+		UIUtils.setDrawFocus(moreBtn, false);
+		UIUtils.setRound(moreBtn, 0);
+		UIUtils.setRolloverDecoratedOnly(moreBtn, true);
+		moreBtn.setOpaque(false);
+		//moreBtn.setPreferredSize(new Dimension(100, 20));
+		JPanel p = new JPanel();
+		p.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Style.border));
+		//p.setPreferredSize(new Dimension(200, 20));
+		UIUtils.setUndecorated(p, true);
+		UIUtils.setMargin(p, new Insets(0,0,0,0));
+		UIUtils.setMargin(moreBtn, new Insets(0,0,0,0));
-		add(moreBtn);
+		p.add(moreBtn);
+		add(p);
 		if(Content.projectExists())
 			update();
 		propModel.addTableModelListener(this);

Panel/PropertyPanel.java CHANGED Viewed

@@ -14,6 +14,7 @@ import web.laf.lite.utils.UIUtils;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
 import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -29,16 +30,22 @@ public class PropertyPanel extends BaseTable {
 	JComboBox<String> texcombo = createComboBox();
 	static int rowCount = 0;
+	static int noOfRows = 16;
 	public PropertyPanel(){
 		super("Properties", null, new PropertyRenderer());
-		editors.add(createTextFieldEditor());
+		editors.add(createTextFieldEditor()); //Name
 		editors.add(createIntegerSpinner("X"));
 		editors.add(createIntegerSpinner("Y"));
 		editors.add(createIntegerSpinner("Width"));
 		editors.add(createIntegerSpinner("Height"));
+		editors.add(createIntegerSpinner("OriginX"));
+		editors.add(createIntegerSpinner("OriginY"));
+		editors.add(createIntegerSpinner("Rotation"));
 		editors.add(createIntegerSpinner("Z-Index"));
 		editors.add(new ColorEditor());
+		editors.add(createTouchableEditor()); //Touchable
+		editors.add(createBooleanEditor()); //Visible
 		editors.add(createTextFieldEditor());
 		editors.add(createTextFieldEditor());
 		editors.add(createTextFieldEditor());
@@ -58,7 +65,7 @@ public class PropertyPanel extends BaseTable {
 	@Override
 	public void clear(String... names){
-		super.clear("Name", "X", "Y", "Width", "Height", "Z-Index", "Color", "", "", "", "");
+		super.clear("Name", "X", "Y", "Width", "Height",  "OriginX", "OriginY", "Rotation", "Z-Index", "Color", "Touchable", "Visible", "", "", "", "");
 	}
 	@Override
@@ -66,12 +73,17 @@ public class PropertyPanel extends BaseTable {
 		rowCount = 0;
 		super.update("Name", ""+SceneEditor.selectedActor.getName(), "X", ""+(int)SceneEditor.selectedActor.getX(),
 				"Y", ""+(int)SceneEditor.selectedActor.getY(), "Width", ""+(int)SceneEditor.selectedActor.getWidth(),
-				"Height", ""+(int)SceneEditor.selectedActor.getHeight(),"Z-Index", ""+(int)SceneEditor.selectedActor.getZIndex(),
+				"Height", ""+(int)SceneEditor.selectedActor.getHeight(), "OriginX",""+(int)SceneEditor.selectedActor.getOriginX(),
+				"OriginY",""+(int)SceneEditor.selectedActor.getOriginY(),"Rotation",""+(int)SceneEditor.selectedActor.getRotation(),
+				"Z-Index", ""+(int)SceneEditor.selectedActor.getZIndex(),
-				"Color", ""+SceneEditor.selectedActor.getColor().toString());
+				"Color", ""+SceneEditor.selectedActor.getColor().toString(),
+				"Touchable", ""+SceneEditor.selectedActor.getTouchable().toString(),
-		editors.set(7, createTextFieldEditor());
+				"Visible", ""+SceneEditor.selectedActor.isVisible()
-		editors.set(8, createTextFieldEditor());
+		);
-		editors.set(9, createTextFieldEditor());
-		editors.set(10, createTextFieldEditor());
+		editors.set(12, createTextFieldEditor());
+		editors.set(13, createTextFieldEditor());
+		editors.set(14, createTextFieldEditor());
+		editors.set(15, createTextFieldEditor());
 		/* From here it varies for each type */
 		if(SceneEditor.selectedActor instanceof ImageJson){
@@ -79,7 +91,7 @@ public class PropertyPanel extends BaseTable {
 			texcombo.removeAllItems();
 			for(String tex: Asset.texMap.keys())
 				texcombo.addItem(tex);
-			editors.set(7, new DefaultCellEditor(texcombo));
+			editors.set(12, new DefaultCellEditor(texcombo));
 		}
 		/* FONTS */
@@ -89,7 +101,7 @@ public class PropertyPanel extends BaseTable {
 			fontcombo.removeAllItems();
 			for(String font: Asset.fontMap.keys())
 				fontcombo.addItem(font);
-			editors.set(7, new DefaultCellEditor(fontcombo));
+			editors.set(12, new DefaultCellEditor(fontcombo));
 		}
 		if(SceneEditor.selectedActor instanceof TextButton){
@@ -105,9 +117,9 @@ public class PropertyPanel extends BaseTable {
 			addRow("Text", ""+((CheckBox)SceneEditor.selectedActor).getText());
 		if(SceneEditor.selectedActor instanceof Dialog){
-			editors.set(7, createBooleanEditor());
+			editors.set(12, createBooleanEditor());
-			editors.set(8, createBooleanEditor());
+			editors.set(13, createBooleanEditor());
-			editors.set(9, createBooleanEditor());
+			editors.set(14, createBooleanEditor());
 			addRow("Modal", ""+((Dialog)SceneEditor.selectedActor).isModal()); //7
 			addRow("Moveble", ""+((Dialog)SceneEditor.selectedActor).isMovable()); //8
 			addRow("Resizable", ""+((Dialog)SceneEditor.selectedActor).isResizable()); //9
@@ -128,15 +140,15 @@ public class PropertyPanel extends BaseTable {
 		}
 		if(SceneEditor.selectedActor instanceof Sprite){
 			Sprite sprite = ((Sprite)SceneEditor.selectedActor);
-			editors.set(7, createBooleanEditor());
+			editors.set(12, createBooleanEditor());
-			editors.set(8, createBooleanEditor());
+			editors.set(13, createBooleanEditor());
 			addRow("Active", ""+sprite.isAnimationActive);
 			addRow("Looping", ""+sprite.isAnimationLooping);
 			addRow("Duration", ""+sprite.getDuration());
 			addRow("Textures", ""+sprite.toString());
 		}
 		int value = getRowCount();
-		for(int i=0;i<11-value;i++)
+		for(int i=0;i<noOfRows-value;i++)
 			addRow("", "");
 	}
@@ -162,13 +174,25 @@ public class PropertyPanel extends BaseTable {
 			case "Y": SceneEditor.selectedActor.setY(Float.parseFloat(value));break;
 			case "Width": SceneEditor.selectedActor.setWidth(Float.parseFloat(value));break;
 			case "Height": SceneEditor.selectedActor.setHeight(Float.parseFloat(value));break;
+			case "OriginX": SceneEditor.selectedActor.setOriginX(Float.parseFloat(value));break;
+			case "OriginY": SceneEditor.selectedActor.setOriginY(Float.parseFloat(value));break;
+			case "Rotation": SceneEditor.selectedActor.setRotation(Float.parseFloat(value));break;
 			case "Z-Index":
 				int z = Integer.parseInt(value);
-				//if(z<0)
-				//	updateProperty("Z-Index", ""+SceneEditor.selectedActor.getZIndex(), 0);
+				if(!(z<0) && !(z>Stage.getRoot().getChildren().size))
-				//else
 					SceneEditor.selectedActor.setZIndex(z);
+				else
+					updateProperty("Z-Index", ""+SceneEditor.selectedActor.getZIndex(), 0);
 				break;
+			case "Color":
+				if(value.length() == 8 && value.matches("[0-9A-Fa-f]+"))
+					SceneEditor.selectedActor.setColor(Color.valueOf(value));
+			break;
+			case "Touchable":SceneEditor.selectedActor.setTouchable(Touchable.valueOf(value));break;
+			case "Visible":SceneEditor.selectedActor.setVisible(Boolean.parseBoolean(value));break;
 			case "Text":
 				if(SceneEditor.selectedActor instanceof Label){
 					((Label)SceneEditor.selectedActor).setText(value);
@@ -190,11 +214,6 @@ public class PropertyPanel extends BaseTable {
 				}
 				break;
-			case "Color":
-					if(value.length() == 8 && value.matches("[0-9A-Fa-f]+"))
-						SceneEditor.selectedActor.setColor(Color.valueOf(value));
-				break;
 			// TextField Related Properties
 			case "MessageText": ((TextField)SceneEditor.selectedActor).setMessageText(value);break;
 			case "Password": ((TextField)SceneEditor.selectedActor).setPasswordMode(Boolean.parseBoolean(value));break;
@@ -261,6 +280,7 @@ public class PropertyPanel extends BaseTable {
 				break;
 		}
 		SceneEditor.isDirty = true;
+		Stage.outline(SceneEditor.selectedActor);
 		Frame.dashPanel.update();
 	}
@@ -273,7 +293,7 @@ public class PropertyPanel extends BaseTable {
 				case "Y": super.updateProperty(key, value, 2);break;
 				case "Width": super.updateProperty(key, value, 3);break;
 				case "Height": super.updateProperty(key, value, 4);break;
-				case "Z-Index": super.updateProperty(key, value, 5);break;
+				case "Z-Index": super.updateProperty(key, value, 8);break;
 			}
 		}
 	}
@@ -290,18 +310,23 @@ class PropertyRenderer extends BaseRenderer {
     	    checkBox.setHorizontalAlignment(JLabel.CENTER);
     	    return checkBox;
     	}*/
+		//try {
+	        Boolean.parseBoolean(value.toString());
+	   // } catch ( java.text.ParseException e ) {
+	  //  	e.printStackTrace();
+	  //  }
         setBorder(noFocusBorder);
         if(column == 0)
         	return new HeaderLabel(value.toString());
         else {
-        	if(row >= 1 && row <=5){
+        	if(row >= 1 && row <=8){
         		if(!value.toString().isEmpty())
-        			spinnerInteger.setValue((Integer)Integer.parseInt(value.toString()));
+        			spinnerInteger.setValue((int)Float.parseFloat(value.toString()));
         		else
         			spinnerInteger.setValue(new Integer(0));
         		return spinnerInteger;
             }
-        	if(row == 6){
+        	if(row == 9){
         		label.setOpaque(true);
         		label.setBorder(BorderFactory.createLineBorder(java.awt.Color.gray));
         		String colorString = (String) value;

Panel/ReplacePanel.java CHANGED Viewed

@@ -4,10 +4,11 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import web.laf.lite.layout.HorizontalFlowLayout;
+import web.laf.lite.utils.UIUtils;
 public class ReplacePanel extends JPanel {
 	private static final long serialVersionUID = 1L;
-	private JButton findButton = new JButton("Find");
+	//private JButton findButton = new JButton("Find");
 	private JTextField replaceField = new JTextField();
 	private JButton replaceButton = new JButton("Replace");
 	private JButton replaceFindButton = new JButton("Replace/Find");
@@ -15,6 +16,7 @@ public class ReplacePanel extends JPanel {
 	public ReplacePanel(){
 		super(new HorizontalFlowLayout());
+		UIUtils.setUndecorated(this, true);
 		add(new JLabel("Replace With:"));
 		add(replaceField);
 		add(replaceButton);

Panel/SceneEffectPanel.java CHANGED Viewed

@@ -41,9 +41,12 @@ public class SceneEffectPanel extends BaseTable {
 	@Override
 	public void update(String... values){
+		if(Stage.getScene() == null)
+			return;
+		Scene scene = Stage.getScene();
-		super.update("Background", Scene.sceneBackground, "Music", Scene.sceneMusic,
+		super.update("Background", scene.sceneBackground, "Music", scene.sceneMusic,
-				"Transition", Scene.sceneTransition, "Duration", ""+Scene.sceneDuration,
+				"Transition", scene.sceneTransition, "Duration", ""+scene.sceneDuration,
-				"Interpolation", Scene.sceneInterpolationType.toString());
+				"Interpolation", scene.sceneInterpolationType.toString());
 		bgComboBox.removeAllItems();
 		musicComboBox.removeAllItems();
 		bgComboBox.addItem("None");
@@ -58,36 +61,38 @@ 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();
 		switch(key){
 			case "Background":
-				Scene.sceneBackground = value;
+				scene.sceneBackground = value;
-				if(!Scene.sceneBackground.equals("None"))
+				if(!scene.sceneBackground.equals("None"))
-					Stage.setBackground(Scene.sceneBackground);
+					Stage.setBackground(scene.sceneBackground);
 				else
 					Stage.removeBackground();
 				break;
 			case "Music":
-				Scene.sceneMusic = value;
+				scene.sceneMusic = value;
-				if(!Scene.sceneMusic.equals("None"))
+				if(!scene.sceneMusic.equals("None"))
-					Asset.musicPlay(Scene.sceneMusic);
+					Asset.musicPlay(scene.sceneMusic);
 				break;
 			case "Transition":
-				Scene.sceneTransition = value;
+				scene.sceneTransition = value;
+				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
+						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
-				doTransition();break;
+				break;
 			case "Duration":
-				Scene.sceneDuration = Float.parseFloat(value);
+				scene.sceneDuration = Float.parseFloat(value);
-				doTransition();
+				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
+						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
 				break;
 			case "Interpolation":
-				Scene.sceneInterpolationType = InterpolationType.valueOf(value);
+				scene.sceneInterpolationType = InterpolationType.valueOf(value);
-				doTransition();
+				Effect.transition(TransitionType.valueOf(scene.sceneTransition),
+						Stage.getRoot(),scene.sceneDuration, scene.sceneInterpolationType);
 				break;
 		}
 		SceneEditor.isDirty = true;
 	}
-	void doTransition(){
-		Effect.transition(TransitionType.valueOf(Scene.sceneTransition),
-				Stage.getRoot(),Scene.sceneDuration, Scene.sceneInterpolationType);
-	}
 }

Panel/ScenePanel.java CHANGED Viewed

@@ -1,4 +1,7 @@
+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;
@@ -10,33 +13,42 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
+import javax.swing.Timer;
 import javax.swing.event.ListSelectionEvent;
 import web.laf.lite.widget.CenterPanel;
-import com.badlogic.gdx.Gdx;
 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.ArrayMap;
+import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.Timer.Task;
-import com.badlogic.gdx.utils.StringBuilder;
-import com.sun.xml.internal.ws.util.StringUtils;
 final public class ScenePanel extends BaseList {
 	private static final long serialVersionUID = 1L;
-	private final static JTextField addField = new JTextField ();
-	public static JComboBox<String> stateComboBox = new JComboBox<String>(new String[]{
+	public static JComboBox<String> stateComboBox = BaseTable.createComboBox("Scenes", "Maps", "Actors");
-			"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(){
@@ -55,17 +67,18 @@ final public class ScenePanel extends BaseList {
 	void initToolBar(){
 		JPanel tools = Style.createButtonToolBarPanel();
-		addscene = Style.createExplorerToolPopButton("New Scene", "newfile", addField, this);
+		addscene = Style.createToolButton("New Scene", "newfile", this);
-		updown = Style.createExplorerToolButton("ScenePriority", "updown", this);
+		updown = Style.createToolButton("ScenePriority", "updown", this);
-		delete = Style.createExplorerToolButton("Delete", "trash", this);
+		delete = Style.createToolButton("Delete", "trash", this);
-		resume = Style.createExplorerToolButton("Resume", "resume", this);
+		resume = Style.createToolButton("Resume", "resume", this);
-		pause = Style.createExplorerToolButton("Pause", "pause", 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);
 	}
@@ -76,9 +89,10 @@ final public class ScenePanel extends BaseList {
 		listModel.clear();
 		for(String s: Scene.scenesMap.keys())
 			listModel.addElement(s);
-		if(Content.sceneFileExists())
+		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));
@@ -90,10 +104,12 @@ final public class ScenePanel extends BaseList {
 	}
 	private void createSceneFile(){
+		String text = JOptionPane.showInputDialog(Frame.getInstance(), "Create a New Scene", "New Scene",
+				JOptionPane.OK_CANCEL_OPTION);
-		if(addField.getText() == null || addField.getText().isEmpty())
+		if(text == null || text.isEmpty())
 			return;
-		String name = addField.getText().replace(".json", "").replace(".java", "");
+		String name = text.replace(".json", "").replace(".java", "");
-		name = StringUtils.capitalize(name);
+		name = Stage.capitalize(name);
 		if(listModel.contains(name)){
 			JOptionPane.showConfirmDialog(null, "Error: File already exists: "+name, "Error",
 					JOptionPane.OK_OPTION);
@@ -106,7 +122,6 @@ final public class ScenePanel extends BaseList {
 			Scene.scenesMap.put(name, "");
 			Frame.eventPanel.update();
 		}
-		addField.setText("");
 		list.setSelectedIndex(listModel.indexOf(name));
 		SceneEditor.isDirty = true;
 		save();
@@ -213,6 +228,7 @@ final public class ScenePanel extends BaseList {
 				return;
 			if(resume.isEnabled())
 				runStudio();
+			Frame.actorPanel.setHeaderText(list.getSelectedValue());
 		}
 	}
@@ -229,20 +245,21 @@ final public class ScenePanel extends BaseList {
 	public void showStudio(){
 		Frame.actorPanel.clear();
 		Stage.getRoot().clearChildren();
-		Stage.clearAllListeners();
+		Stage.clearAllHud();
 		Stage.followActor(null);
 		Stage.resetCamera();
-		if(Content.sceneFileExists())
+		if(Content.sceneFileExists()){
-			load(Content.getSceneFile());
+			//load(Content.getSceneFile());
+			Stage.getScene().load(Content.getSceneFile());
-		for(Actor child: Stage.getChildren()){
+			for(Actor child: Stage.getChildren()){
-			if(child.getName() != null)
+				if(Stage.isValidActor(child)){
-				Frame.actorPanel.addActor(child.getName());
+					Frame.actorPanel.addActor(child.getName());
-			for(EventListener l: child.getListeners())
+					for(EventListener l: child.getListeners())
-				child.removeListener(l);
+						child.removeListener(l);
+				}
+			}
 		}
 		Frame.sceneEffectPanel.update();
-		if(Stage.getScene() != null)
-			Stage.addActor(Stage.getScene());
 	}
 	private static File classPath = new File(Content.getProject()+"bin/");
@@ -260,46 +277,263 @@ final public class ScenePanel extends BaseList {
 		}
 	}
-	public static void load(String sceneName){
-		Main.log("Load");
-		String[] lines = Scene.scenesMap.get(sceneName).split("\n");
-		for(String line: lines){
-			if(line.trim().isEmpty())
-				continue;
-			JsonValue jv = Stage.jsonReader.parse(line);
-			Serializer.deserialize(jv.get("class").asString(), line);
-		}
-	}
-	public static void save(){
+	private void save(){
 		if(currentState != SceneState.SceneEditor)
 			return;
 		if(!SceneEditor.isDirty)
 			return;
-		Main.log("Save");
-		StringBuilder sb = new StringBuilder();
-		sb.append("{class:SceneJson,");
-		sb.append("background:\""+Scene.sceneBackground+"\",");
-		sb.append("music:\""+Scene.sceneMusic+"\",");
-		sb.append("transition:\""+Scene.sceneTransition+"\",");
-		sb.append("duration:"+Scene.sceneDuration+",");
-		sb.append("interpolation:"+Scene.sceneInterpolationType.toString()+"}");
-		sb.append("\n");
-		Stage.removeActor("Shape");
-		for(Actor actor: Stage.getChildren()){
-			if(Stage.isValidActor(actor)){
-				//log(actor.getName());
-				sb.append(Stage.json.toJson(actor));
-				sb.append("\n");
-			}
-		}
-		Scene.scenesMap.put(Content.getSceneFile(), sb.toString());
+		Stage.getScene().save(Content.getSceneFile());
-		Gdx.files.local(Asset.basePath+"scene").writeString(Stage.json.toJson(Scene.scenesMap, ArrayMap.class, String.class), false);
-		sb = null;
 		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/SceneTemplate.txt CHANGED Viewed

@@ -29,8 +29,16 @@ public class $$$ extends Scene {
 	}
 	@Override
-	public void onDragged(){
+    public void onKeyTyped(char key){
-	}
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
 	@Override
 	public void onPause(){

Panel/StudioPanel.java CHANGED Viewed

@@ -1,4 +1,3 @@
-import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -8,10 +7,6 @@ import java.awt.datatransfer.Transferable;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetDropEvent;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -19,7 +14,6 @@ import java.nio.ByteBuffer;
 import javax.imageio.ImageIO;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.Timer;
 import web.laf.lite.layout.VerticalFlowLayout;
 import web.laf.lite.utils.UIUtils;
@@ -33,7 +27,6 @@ import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Pixmap.Format;
 import com.badlogic.gdx.graphics.PixmapIO;
 import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
 import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
@@ -46,266 +39,17 @@ 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.ui.Touchpad;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.scenes.scene2d.utils.DragAndDrop;
 import com.badlogic.gdx.tools.hiero.HieroPanel;
 import com.badlogic.gdx.tools.particleeditor.ParticlePanel;
 import com.badlogic.gdx.tools.particleeditor.ParticleRenderer;
-import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Timer.Task;
-class SceneEditor extends Scene {
-	public static Actor selectedActor = null;
-	public static boolean reloadAssets = false;
-	static AddField addField;
-	DragAndDrop dragAndDrop = new DragAndDrop();
-	public SceneEditor(){
-		super();
-		if(reloadAssets){
-			Asset.loadBlocking();  // this is the first time this Scene is created by the Stage
-			Content.assetPanel.updateAsset();
-			Frame.scenePanel.showStudio();
-			Scene.scenesMap.removeKey("SceneEditor");
-			Frame.scenePanel.update();
-			reloadAssets = false;
-			addField = new AddField();
-			Stage.addActor(this);
-		}
-		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);
-					Main.log(""+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 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());
-	    		}
-			}
-		});
-	}
-}
 final public class StudioPanel extends JPanel  {
 	private static final long serialVersionUID = 1L;
 	LwjglCanvas can;
 	LwjglAWTCanvas canvas;
-	final Timer saveTimer = new Timer(10000, new ActionListener(){
-		@Override
-		public void actionPerformed(ActionEvent arg0) {
-			ScenePanel.save();
-		}
-	});
 	Image img;
 	public StudioPanel(){
 		super(new VerticalFlowLayout());
@@ -396,18 +140,6 @@ final public class StudioPanel extends JPanel  {
 					}
 				}
 			});
-			canvas.getCanvas().addFocusListener(new FocusListener(){
-				@Override
-				public void focusGained(FocusEvent arg0) {
-					saveTimer.start();
-				}
-				@Override
-				public void focusLost(FocusEvent arg0) {
-					ScenePanel.save();
-					saveTimer.stop();
-				}
-			});
 			Asset.save();
 		}catch(Exception ex){
 			ex.printStackTrace();
@@ -431,18 +163,23 @@ final public class StudioPanel extends JPanel  {
 	}
-	public void setName(Actor actor){
+	public void setName(final Actor actor){
+		com.badlogic.gdx.utils.Timer.schedule(new Task(){
+			@Override
+			public void run() {
-		String name = actor.getClass().getSimpleName()+getNameCount(actor);
+				String name = actor.getClass().getSimpleName()+getNameCount(actor);
-		if(Stage.findActor(name) == null)
+				if(Stage.findActor(name) == null)
-			actor.setName(name);
+					actor.setName(name);
-		else
+				else
-			actor.setName(name+"_1");
+					actor.setName(name+"_1");
-		actor.setX(Stage.mouse.x/2);
+				actor.setX(Stage.mouse.x-actor.getWidth()/2);
-		actor.setY(Stage.mouse.y/2);
+				actor.setY(Stage.mouse.y-actor.getHeight()/2);
-		Stage.addActor(actor);
+				Stage.addActor(actor);
-		Frame.actorPanel.addActor(actor.getName());
+				Frame.actorPanel.addActor(actor.getName());
-		SceneEditor.isDirty = true;
+				SceneEditor.isDirty = true;
-		Effect.createEffect(actor, EffectType.ScaleInOut, 1.5f, 0.5f, InterpolationType.Linear);
+				Effect.createEffect(actor, EffectType.ScaleInOut, 1.5f, 0.5f, InterpolationType.Linear);
+			}
+		}, 0.1f);
 	}
 	public void createActor(String type){

Panel/TablePanel.java CHANGED Viewed

@@ -26,7 +26,7 @@ public class TablePanel extends JPanel implements ActionListener {
 	public TablePanel(String title){
 		super(new VerticalFlowLayout());
 		UIUtils.setUndecorated(this, false);
-		headerButton = Style.createHeaderButton(title, this);
+		headerButton = new Style.TitleButton(title, this);
 		if(!title.isEmpty()){
 			add(headerButton);
 		}

Panel/WidgetPanel.java CHANGED Viewed

@@ -24,7 +24,7 @@ public class WidgetPanel extends BaseList implements DragSourceListener, DragGes
 		super("Widgets", "Label","Image", "Sprite", "Button","TextButton", "CheckBox",
 				"List", "SelectBox", "Slider", "TextField",
 				"Table", "Dialog", "Touchpad", "Map");
-		scrollPane.setPreferredSize(new Dimension(200, 100));
+		scrollPane.setPreferredSize(new Dimension(200, 50));
 		dragSource.addDragSourceListener(this);
 	    dragSource.createDefaultDragGestureRecognizer(list, DnDConstants.ACTION_MOVE, this);
 	}

Panel/project.properties DELETED Viewed

@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-# Project target.
-target=android-15

Stage/Asset.java CHANGED Viewed

@@ -500,23 +500,43 @@ public final class Asset {
 	}
 	/*
-	 * Load a model from the model directory
+	 * Load a G3db model from the model directory
 	 * @param modelName The name of the modelFile
 	 * @example loadModel("ship");
 	 */
 	public static Actor3d loadModel(String modelName){
+		assetMan.load(basePath+"model/"+modelName+".g3db", Model.class);
+		assetMan.finishLoading();
+		return new Actor3d(assetMan.get(basePath+"model/"+modelName+".g3db", Model.class));
+	}
+	/*
+	 * Unload a G3db model which was previously loaded in the assetManager
+	 * @param modelName The name of the modelFile that was loaded
+	 * @example unloadModel("ship");
+	 */
+	public static void unloadModel(String modelName){
+		assetMan.unload(basePath+"model/"+modelName+".g3db");
+	}
+	/*
+	 * Load a Obj model from the model directory
+	 * @param modelName The name of the modelFile
+	 * @example loadModel("ship");
+	 */
+	public static Actor3d loadModelObj(String modelName){
 		assetMan.load(basePath+"model/"+modelName+".obj", Model.class);
 		assetMan.finishLoading();
 		return new Actor3d(assetMan.get(basePath+"model/"+modelName+".obj", Model.class));
 	}
 	/*
-	 * Unload a model which was previously loaded in the assetManager
+	 * Unload a Obj model which was previously loaded in the assetManager
 	 * @param modelName The name of the modelFile that was loaded
 	 * @example unloadModel("ship");
 	 */
-	public static void unloadModel(String modelName){
+	public static void unloadModelObj(String modelName){
-		assetMan.unload(basePath+"model/"+modelName+".g3d");
+		assetMan.unload(basePath+"model/"+modelName+".obj");
 	}
 /***********************************************************************************************************

Stage/Config.java CHANGED Viewed

@@ -35,7 +35,6 @@ public final class Config {
     public static float volMusic;
     public static float volSound;
-    public static boolean usePan;
     public static boolean useDrag;
     public static boolean useKeyboard;
@@ -52,7 +51,7 @@ public final class Config {
        volMusic = prefs.getFloat(VOLUME_MUSIC, 1f);
        volSound = prefs.getFloat(VOLUME_SOUND, 1f);
-       usePan = prefs.getBoolean(PANSCROLL, true);
+       Stage.usePan = prefs.getBoolean(PANSCROLL, true);
        useDrag = prefs.getBoolean(DRAGSCROLL, true);
        useKeyboard = prefs.getBoolean(KEYBOARD, true);
@@ -132,7 +131,7 @@ public final class Config {
     public static void setPanScroll(boolean ue){
         prefs.putBoolean(PANSCROLL, ue);
         prefs.flush();
-        usePan = ue ;
+        Stage.usePan = ue ;
     }
     public static void setDragScroll(boolean ue){

Stage/Map.java CHANGED Viewed

@@ -1,6 +1,3 @@
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.maps.MapLayer;
 import com.badlogic.gdx.maps.MapLayers;
@@ -102,4 +99,38 @@ public class Map extends Group{
 	public MapLayers getMapLayers(){
 		return mlayers;
 	}
+}
+class MapLayerg extends Group {
+	public MapLayerg(int index){
+		this.setZIndex(index);
+	}
+}
+class RPGMap {
+	private static RPGMap instance;
+	MapLayerg mapLayer1;
+	MapLayerg mapLayer2;
+	MapLayerg mapLayer3;
+	MapLayerg mapLayer4;
+	MapLayerg mapLayer5;
+	MapLayerg mapLayer6;
+	MapLayerg mapLayer7;
+	private RPGMap(){
+		mapLayer1 = new MapLayerg(1);
+		mapLayer2 = new MapLayerg(2);
+		mapLayer3 = new MapLayerg(3);
+		mapLayer4 = new MapLayerg(4);
+		mapLayer5 = new MapLayerg(5);
+		mapLayer6 = new MapLayerg(6);
+		mapLayer7 = new MapLayerg(7);
+	}
+	public static RPGMap getInstance(){
+		if(instance == null)
+			instance = new RPGMap();
+		return instance;
+	}
 }

Stage/Scene.java CHANGED Viewed

@@ -1,7 +1,6 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.utils.ArrayMap;
-import com.badlogic.gdx.utils.JsonValue;
 import com.badlogic.gdx.utils.StringBuilder;
 abstract public class Scene extends Actor {
@@ -9,20 +8,20 @@ abstract public class Scene extends Actor {
 	public static final ArrayMap<String, String> scenesMap = new ArrayMap<String, String>();
 	private String sceneName = "";
-	public static String sceneBackground = "";
+	public String sceneBackground = "None";
-	public static String sceneMusic = "";
+	public String sceneMusic = "None";
-	public static String sceneTransition = "";
+	public String sceneTransition = "None";
-	public static float sceneDuration = 0;
+	public float sceneDuration = 0;
-	public static InterpolationType sceneInterpolationType = InterpolationType.Linear;
+	public InterpolationType sceneInterpolationType = InterpolationType.Linear;
 	public Scene(){
 		setPosition(0, 0);
 		setSize(0, 0);
 		setBounds(0,0, 0, 0);
-		Stage.addActor(this);
 		sceneName = this.getClass().getName();
+		setName(sceneName);
 		Stage.log("Current Scene: "+sceneName);
-		load();
+		load(sceneName);
 	}
 	public abstract void onClick(Actor actor);
@@ -30,33 +29,41 @@ abstract public class Scene extends 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();
-	private void load(){
+	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;
-			JsonValue jv = Stage.jsonReader.parse(line);
+			Stage.addActor(Stage.json.fromJson(Actor.class, line));
-			Serializer.deserialize(jv.get("class").asString(), 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);
 	}
-	public void save(){
+	protected void save(){
+		save(sceneName);
+	}
+	public void save(String sceneName){
+		Stage.log("Save");
 		StringBuilder sb = new StringBuilder();
-		sb.append("{class:SceneJson,");
-		sb.append("background:\""+sceneBackground+"\",");
-		sb.append("music:\""+sceneMusic+"\",");
-		sb.append("transition:\""+sceneTransition+"\",");
-		sb.append("duration:"+sceneDuration+",");
-		sb.append("interpolation:"+sceneInterpolationType.toString()+"}");
-		sb.append("\n");
 		Stage.removeActor("Shape");
 		for(Actor actor: Stage.getChildren()){
 			if(Stage.isValidActor(actor)){
-				//log(actor.getName());
+				//Stage.log(actor.getName());
 				sb.append(Stage.json.toJson(actor));
 				sb.append("\n");
 			}

Stage/Serializer.java CHANGED Viewed

@@ -1,6 +1,7 @@
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Group;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
 import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
@@ -16,44 +17,22 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.ui.Touchpad;
 import com.badlogic.gdx.scenes.scene2d.ui.Tree;
+import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup;
 import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 public class Serializer {
-	public static void deserialize(String className, String value){
-		if(className.equals("SceneJson")){
-			JsonValue jv = Stage.jsonReader.parse(value);
-			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"));
-			if(!Scene.sceneBackground.equals("None"))
-				Stage.setBackground(Scene.sceneBackground);
-			if(!Scene.sceneMusic.equals("None"))
-				Asset.musicPlay(Scene.sceneMusic);
-			Effect.transition(TransitionType.valueOf(Scene.sceneTransition),
-					Stage.getRoot(),Scene.sceneDuration, Scene.sceneInterpolationType);
-		}
-		else{
-			try {
-				Class cc = Class.forName(className);
-				Stage.addActor((Actor)Stage.json.fromJson(cc, value));
-			}
-			catch (ClassNotFoundException e) {
-				e.printStackTrace();
-			}
-		}
-	}
 	public static void registerSerializer(Class clazz, Json.Serializer serializer){
 		Stage.json.setSerializer(clazz, serializer);
 	}
 	public static void initialize(){
 		registerSerializer(Actor.class, new ActorSerializer());
+		registerSerializer(Scene.class, new SceneSerializer());
 		registerSerializer(ImageJson.class, new ImageJson());
 		registerSerializer(Label.class, new LabelSerializer());
 		registerSerializer(Button.class, new ButtonSerializer());
@@ -64,9 +43,18 @@ public class Serializer {
 		registerSerializer(List.class, new ListSerializer());
 		registerSerializer(Slider.class, new SliderSerializer());
 		registerSerializer(TextField.class, new TextFieldSerializer());
-		registerSerializer(Dialog.class, new DialogSerializer());
 		registerSerializer(Touchpad.class, new TouchpadSerializer());
 		registerSerializer(Sprite.class, new SpriteSerializer());
+		registerSerializer(Dialog.class, new DialogSerializer());
+		registerSerializer(SplitPane.class, new SplitPaneSerializer());
+		registerSerializer(ScrollPane.class, new ScrollPaneSerializer());
+		registerSerializer(Stack.class, new StackSerializer());
+		registerSerializer(Tree.class, new TreeSerializer());
+		registerSerializer(Table.class, new TableSerializer());
+		registerSerializer(ButtonGroup.class, new ButtonGroupSerializer());
+		registerSerializer(HorizontalGroup.class, new HorizontalGroupSerializer());
+		registerSerializer(VerticalGroup.class, new VerticalGroupSerializer());
 	}
 	public static class ActorSerializer implements Json.Serializer<Actor> {
@@ -91,7 +79,13 @@ public class Serializer {
 			actor.setY(jv.getFloat("y"));
 			actor.setWidth(jv.getFloat("width"));
 			actor.setHeight(jv.getFloat("height"));
+			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"));
 		}
 		public static void writeActor(Json json, Actor actor){
@@ -101,32 +95,44 @@ public class Serializer {
 			json.writeValue("y", actor.getY());
 			json.writeValue("width", actor.getWidth());
 			json.writeValue("height", actor.getHeight());
-			json.writeValue("color", actor.getColor().toString());
 			json.writeValue("ox", actor.getOriginX());
 			json.writeValue("oy", actor.getOriginY());
 			json.writeValue("rotation", actor.getRotation());
+			json.writeValue("zindex", actor.getZIndex());
+			json.writeValue("color", actor.getColor().toString());
+			json.writeValue("touchable", actor.getTouchable().toString());
+			json.writeValue("visible", actor.isVisible());
 		}
 	}
-	public static class GroupSerializer extends ActorSerializer {
+	public static class SceneSerializer extends ActorSerializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
-			Group group = new Group();
+			Scene scene = Stage.getScene();
+			scene.sceneBackground = jv.getString("background");
-			readActor(jv, group);
+			scene.sceneMusic = jv.getString("music");
+			scene.sceneTransition = jv.getString("transition");
+			scene.sceneDuration = jv.getFloat("duration");
+			scene.sceneInterpolationType = InterpolationType.valueOf(jv.getString("interpolation"));
-			return group;
+			return scene;
 		}
 		@Override
-		public void write(Json json, Actor actor, Class arg2) {
+		public void write(Json json, Actor label, Class arg2) {
 			json.writeObjectStart();
-			writeActor(json, actor);
+			Scene scene = (Scene) label;
+			json.writeValue("class", "Scene");
+			json.writeValue("background", scene.sceneBackground);
+			json.writeValue("music", scene.sceneMusic);
+			json.writeValue("transition", scene.sceneTransition);
+			json.writeValue("duration", scene.sceneDuration);
+			json.writeValue("interpolation", scene.sceneInterpolationType.toString());
 			json.writeObjectEnd();
 		}
 	}
-	private static class LabelSerializer extends ActorSerializer {
+	public static class LabelSerializer extends ActorSerializer {
 		@Override
 		public Actor read(Json json, JsonValue jv, Class arg2) {
@@ -251,31 +257,6 @@ public class Serializer {
 	}
-	private static class DialogSerializer extends ActorSerializer {
-		@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"));
-			return dialog;
-		}
-		@Override
-		public void write(Json json, Actor dialog, Class arg2) {
-			json.writeObjectStart();
-			writeActor(json, dialog);
-			json.writeValue("title", ((Dialog)dialog).getTitle());
-			json.writeValue("modal", ((Dialog)dialog).isModal());
-			json.writeValue("move", ((Dialog)dialog).isMovable());
-			json.writeValue("resize", ((Dialog)dialog).isResizable());
-			json.writeObjectEnd();
-		}
-	}
 	public static class TouchpadSerializer extends ActorSerializer {
 		public static float deadZoneRadius = 5f;
 		@Override
@@ -330,124 +311,246 @@ public class Serializer {
 			json.writeObjectEnd();
 		}
 	}
-	private static class SplitPaneSerializer extends ActorSerializer {
+	private static class SpriteSerializer extends ActorSerializer {
+		@Override
+		public Actor read(Json arg0, JsonValue jv, Class arg2) {
+			Sprite sprite;
+			if(jv.getInt("frameCount") != 1){
+				sprite = new Sprite(jv.getString("textures").split(",")[0], jv.getInt("frameCount"),
+						jv.getFloat("duration"));
+			}
+			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");
+			return sprite;
+		}
+		@Override
+		public void write(Json json, Actor sprite, Class arg2) {
+			json.writeObjectStart();
+			ActorSerializer.writeActor(json, sprite);
+			json.writeValue("textures", sprite.toString());
+			json.writeValue("duration", ((Sprite)sprite).getDuration());
+			json.writeValue("active", ((Sprite)sprite).isAnimationActive);
+			json.writeValue("looping", ((Sprite)sprite).isAnimationLooping);
+			json.writeValue("frameCount", ((Sprite)sprite).getFrameCount());
+			json.writeObjectEnd();
+		}
+	}
+	public static class GroupSerializer implements Json.Serializer<Group> {
+		@Override
+		public Group read(Json json, JsonValue jv, Class arg2) {
+			Group group = new Group();
+			readGroup(jv, group);
+			return group;
+		}
+		@Override
+		public void write(Json json, Group group, Class arg2) {
+			json.writeObjectStart();
+			writeGroup(json, group);
+			json.writeObjectEnd();
+		}
+		public void writeGroup(Json json, Group group){
+			ActorSerializer.writeActor(json, group);
+			//Array<String> actorsJson = new Array<String>();
+			//for(Actor actor: group.getChildren()){
+			//	actorsJson.add(Stage.json.toJson(actor));
+			//}
+			//json.writeValue("children", actorsJson, Array.class, String.class);
+			//not working
+		}
+		public void readGroup(JsonValue jv, Group group){
+			ActorSerializer.readActor(jv, group);
+			//Array<String> array = (Array<String>)Stage.json.readValue(Array.class, String.class,
+			//		jv.get("children"));
+			//for(String actorJson: array.items){
+			//	Stage.log(actorJson);
+			//	//group.addActor(Stage.json.fromJson(actor));
+			//}
+		}
+		public void iterateActors(){
+		}
+	}
+	private static class DialogSerializer extends ActorSerializer {
 		@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"));
+			return dialog;
+		}
+		@Override
+		public void write(Json json,  Actor dialog, Class arg2) {
+			json.writeObjectStart();
+			writeActor(json, dialog);
+			json.writeValue("title", ((Dialog)dialog).getTitle());
+			json.writeValue("modal", ((Dialog)dialog).isModal());
+			json.writeValue("move", ((Dialog)dialog).isMovable());
+			json.writeValue("resize", ((Dialog)dialog).isResizable());
+			json.writeObjectEnd();
+		}
+	}
+	private static class SplitPaneSerializer extends GroupSerializer {
+		@Override
+		public Group read(Json json, JsonValue jv, Class arg2) {
 			SplitPane label = new SplitPane(null, null, false, Asset.skin);
-			readActor(jv, label);
+			readGroup(jv, label);
 			return label;
 		}
 		@Override
-		public void write(Json json, Actor label, Class arg2) {
+		public void write(Json json, Group label, Class arg2) {
 			json.writeObjectStart();
-			writeActor(json, label);
+			writeGroup(json, label);
 			json.writeObjectEnd();
 		}
 	}
-	private static class ScrollPaneSerializer extends ActorSerializer {
+	private static class ScrollPaneSerializer extends GroupSerializer {
 		@Override
-		public Actor read(Json json, JsonValue jv, Class arg2) {
+		public Group read(Json json, JsonValue jv, Class arg2) {
 			ScrollPane label = new ScrollPane(null);
-			readActor(jv, label);
+			readGroup(jv, label);
 			return label;
 		}
 		@Override
-		public void write(Json json, Actor label, Class arg2) {
+		public void write(Json json, Group label, Class arg2) {
 			json.writeObjectStart();
-			writeActor(json, label);
+			writeGroup(json, label);
 			json.writeObjectEnd();
 		}
 	}
-	private static class StackSerializer extends ActorSerializer {
+	private static class StackSerializer extends GroupSerializer {
 		@Override
-		public Actor read(Json json, JsonValue jv, Class arg2) {
+		public Group read(Json json, JsonValue jv, Class arg2) {
 			Stack label = new Stack();
-			readActor(jv, label);
+			readGroup(jv, label);
 			return label;
 		}
 		@Override
-		public void write(Json json, Actor label, Class arg2) {
+		public void write(Json json, Group label, Class arg2) {
 			json.writeObjectStart();
-			writeActor(json, label);
+			writeGroup(json, label);
 			json.writeObjectEnd();
 		}
 	}
-	private static class TreeSerializer extends ActorSerializer {
+	private static class TreeSerializer extends GroupSerializer {
 		@Override
-		public Actor read(Json json, JsonValue jv, Class arg2) {
+		public Group read(Json json, JsonValue jv, Class arg2) {
 			Tree label = new Tree(Asset.skin);
-			readActor(jv, label);
+			readGroup(jv, label);
 			return label;
 		}
 		@Override
-		public void write(Json json, Actor label, Class arg2) {
+		public void write(Json json, Group label, Class arg2) {
 			json.writeObjectStart();
-			ActorSerializer.writeActor(json, label);
+			writeGroup(json, label);
 			json.writeObjectEnd();
 		}
 	}
-	private static class TableSerializer extends ActorSerializer {
+	private static class TableSerializer extends GroupSerializer {
 		@Override
-		public Actor read(Json json, JsonValue jv, Class arg2) {
+		public Group read(Json json, JsonValue jv, Class arg2) {
 			Table table = new Table(Asset.skin);
+			//table.getPadBottom()
+			//table.getCell(null).get
-			readActor(jv, table);
+			readGroup(jv, table);
 			return table;
 		}
 		@Override
-		public void write(Json json, Actor table, Class arg2) {
+		public void write(Json json, Group table, Class arg2) {
 			json.writeObjectStart();
-			writeActor(json, table);
+			writeGroup(json, table);
 			json.writeObjectEnd();
 		}
 	}
+	private static class ButtonGroupSerializer extends GroupSerializer {
+		@Override
-	private static class SpriteSerializer extends ActorSerializer {
+		public Group read(Json json, JsonValue jv, Class arg2) {
+			Table table = new Table(Asset.skin);
+			readGroup(jv, table);
+			return table;
+		}
 		@Override
-		public Actor read(Json arg0, JsonValue jv, Class arg2) {
+		public void write(Json json, Group table, Class arg2) {
-			Sprite sprite;
-			if(jv.getInt("frameCount") != 1){
-				sprite = new Sprite(jv.getString("textures").split(",")[0], jv.getInt("frameCount"),
-						jv.getFloat("duration"));
-			}
-			else{
-				sprite = new Sprite(jv.getFloat("duration"), jv.getString("textures").split(","));
-			}
-			ActorSerializer.readActor(jv, sprite);
+			json.writeObjectStart();
-			sprite.isAnimationActive = jv.getBoolean("active");
-			sprite.isAnimationLooping = jv.getBoolean("looping");
-			return sprite;
+			writeGroup(json, table);
+			json.writeObjectEnd();
 		}
+	}
+	private static class HorizontalGroupSerializer extends GroupSerializer {
 		@Override
+		public Group read(Json json, JsonValue jv, Class arg2) {
+			HorizontalGroup hg = new HorizontalGroup();
+			readGroup(jv, hg);
+			return hg;
+		}
+		@Override
-		public void write(Json json, Actor sprite, Class arg2) {
+		public void write(Json json, Group table, Class arg2) {
 			json.writeObjectStart();
-			ActorSerializer.writeActor(json, sprite);
+			writeGroup(json, table);
-			json.writeValue("textures", sprite.toString());
-			json.writeValue("duration", ((Sprite)sprite).getDuration());
-			json.writeValue("active", ((Sprite)sprite).isAnimationActive);
-			json.writeValue("looping", ((Sprite)sprite).isAnimationLooping);
-			json.writeValue("frameCount", ((Sprite)sprite).getFrameCount());
 			json.writeObjectEnd();
 		}
 	}
+	private static class VerticalGroupSerializer extends GroupSerializer {
+		@Override
+		public Group read(Json json, JsonValue jv, Class arg2) {
+			VerticalGroup vg = new VerticalGroup();
+			readGroup(jv, vg);
+			return vg;
+		}
+		@Override
+		public void write(Json json, Group vg, Class arg2) {
+			json.writeObjectStart();
+			writeGroup(json, vg);
+			json.writeObjectEnd();
+		}
+	}
 }

Stage/Sprite.java CHANGED Viewed

@@ -41,7 +41,8 @@ public class Sprite extends Actor {
 		super.draw(batch, parentAlpha);
 		if (isAnimationActive && animation != null) {
 			keyFrame = animation.getKeyFrame(Stage.stateTime, isAnimationLooping);
-			batch.draw(keyFrame, getX(), getY(), getWidth(), getHeight());
+			batch.draw(keyFrame, getX(), getY(), getOriginX(), getOriginY(), getWidth(), getHeight(),
+					getScaleX(), getScaleY(), getRotation());
 		}
 	}

Stage/Stage.java CHANGED Viewed

@@ -4,7 +4,7 @@ import java.awt.Toolkit;
 import com.badlogic.gdx.ApplicationListener;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Files.FileType;
-import com.badlogic.gdx.Input.Keys;
+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;
@@ -120,6 +120,7 @@ public final class Stage implements ApplicationListener {
 	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;
@@ -229,14 +230,13 @@ public final class Stage implements ApplicationListener {
 		camera.setToOrtho(false, targetWidth, targetHeight);
 		camera.position.set(targetWidth/2, targetHeight/2, 0);
 		stage2d.setCamera(camera);
-		Gdx.input.setCatchBackKey(true);
- 		Gdx.input.setCatchMenuKey(true);
- 		Gdx.input.setInputProcessor(stage2d);
+		inputMux.addProcessor(stage2d);
  		stage2d.addListener(touchInput);
  		if(use3d){
  			stage3d = new Stage3d();
 	 		camController = new CameraInputController(stage3d.getCamera());
+	 		inputMux.addProcessor(stage3d);
-	 		//Gdx.input.setInputProcessor(camController);
+	 		inputMux.addProcessor(camController);
  		}
  		shapeRenderer = new ShapeRenderer();
  		Serializer.initialize();
@@ -246,6 +246,9 @@ public final class Stage implements ApplicationListener {
  		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);
 	}
 	/*
@@ -262,14 +265,14 @@ public final class Stage implements ApplicationListener {
 		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();
-		stage2d.act();//Gdx.graphics.getDeltaTime();
-		stage2d.draw();
-		updateController();
 		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);
@@ -359,10 +362,6 @@ public final class Stage implements ApplicationListener {
 		return stage2d.getRoot();
 	}
-	public static void clearAllListeners(){
-		hudActors.clear();
-	}
 	/**
 	 * Get screen time from start in format of HH:MM:SS. It is calculated from
 	 * "secondsTime" parameter.
@@ -409,6 +408,7 @@ public final class Stage implements ApplicationListener {
 		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);
@@ -501,12 +501,15 @@ public final class Stage implements ApplicationListener {
 	}
 	public static void addActor(Actor actor){
+		if(actor != null)
-		stage2d.addActor(actor);
+			stage2d.addActor(actor);
 	}
 	public static void addActor(Actor actor, float x, float y){
+		if(actor != null){
-		actor.setPosition(x, y);
+			actor.setPosition(x, y);
-		stage2d.addActor(actor);
+			stage2d.addActor(actor);
+		}
 	}
 	public static void addActorWithDelay(final Actor actor, float delay){
@@ -521,8 +524,10 @@ public final class Stage implements ApplicationListener {
 	/* 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);
+			addActor(actor);
-		hudActors.add(actor);
+			hudActors.add(actor);
+		}
 	}
 	/* If you want to any elements/actors which was a Hud the use this */
@@ -589,7 +594,7 @@ public final class Stage implements ApplicationListener {
 	public static void clear(){
 		if(currentScene != null)
 			currentScene.onDispose();
-		disablePanning();
+		usePan = false;
 		followActor(null);
 		hudActors.clear();
 		resetCamera();
@@ -636,7 +641,7 @@ public final class Stage implements ApplicationListener {
 		dialog.button("No", "No");
 		dialog.pack();
 		dialog.show(stage2d);
-		//if(dialog.result().equals("Yes")) //update Gdx
+		//if(dialog.result().equals("Yes")) FIXME update Gdx
 		//	return true;
 		return false;
 	}
@@ -651,7 +656,6 @@ public final class Stage implements ApplicationListener {
     private static float lastPercent;
     private static float percentDelta;
     private static float panSpeedX, panSpeedY;
-    //private static final Vector3 mousePos = new Vector3();
     public void moveTo(float x, float y) {
         moveTo(x, y, 0f);
@@ -790,10 +794,8 @@ public final class Stage implements ApplicationListener {
     	mouse.y = Gdx.graphics.getHeight() - Gdx.input.getY();
     	if(!moveCompleted)
     		moveByAction(stateTime);
-    	if(hasControl){
+		if(usePan)
-			if(Config.usePan) panCameraWithMouse();
+			panCameraWithMouse();
-			if(Config.useKeyboard) panCameraWithKeyboard();
-		}
 		if(followedActor != null)
 			follow();
     }
@@ -801,29 +803,7 @@ public final class Stage implements ApplicationListener {
 /***********************************************************************************************************
 * 					2d Controller Related Functions												   	       *
 ************************************************************************************************************/
-    private static boolean hasControl = false;
-    /*
-	 * This will allow you to move the camera using the keyboard key up, left, right, down
-	 * when Config.useKeyboard is true.
-	 * This will allow you to move the camera using the mouse when the mouse reaches the edges of the screen
-	 * when Config.usePan is true.
-	 * This will allow you to move the camera using the mouse when dragging the mouse
-	 * when Config.useDrag is true.
-	 */
-    public static void enablePanning(){
+    public static boolean usePan;
-    	hasControl = true;
-    }
-    /*
-     * This disables all automatic panning and moving of camera
-     */
-    public static void disablePanning(){
-    	hasControl = false;
-    }
     private float panSpeed = 5f;
     private float panXLeftOffset = 100;
 	private float panXRightOffset = 0;//Gdx.graphics.getWidth() - 100;
@@ -871,21 +851,6 @@ public final class Stage implements ApplicationListener {
     	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);
     }
-    private void panCameraWithKeyboard(){
-    	if(Gdx.input.isKeyPressed(Keys.LEFT))
-    		//if(camera.position.x > camOffsetX +5)
-    			moveBy(-panSpeed, 0);
-    	else if(Gdx.input.isKeyPressed(Keys.RIGHT))
-    		//if(camera.position.x < mapOffsetX - 5)
-    			moveBy(panSpeed, 0);
-    	else if(Gdx.input.isKeyPressed(Keys.UP))
-    		//if(camera.position.y < mapOffsetY -5)
-    			moveBy(0, panSpeed);
-    	else if(Gdx.input.isKeyPressed(Keys.DOWN))
-    		//if(camera.position.y > camOffsetYBot +5)
-    			moveBy(0, -panSpeed);
-    }
 	/*
 	 * Gesture related
@@ -986,7 +951,6 @@ public final class Stage implements ApplicationListener {
 		@Override
 		public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
-			super.touchDown(event, x, y, pointer, button);
 			mouse.set(x, y);
 			Stage.pointer = pointer;
 			Stage.button = button;
@@ -996,7 +960,7 @@ public final class Stage implements ApplicationListener {
 			validActor = hit(x,y);
 			if(isValidActor(validActor))
 				currentScene.onTouchDown(validActor);
-			return true;
+			return super.touchDown(event, x, y, pointer, button);
 		}
@@ -1014,8 +978,8 @@ public final class Stage implements ApplicationListener {
 					currentScene.onGesture(getGestureDirection());
 				}
 			}
-			if(hasControl)
+			if(Config.useDrag)
-				if(Config.useDrag) dragCam((int)x, (int)-y);
+				dragCam((int)x, (int)-y);
 		}
 		@Override
@@ -1037,10 +1001,26 @@ public final class Stage implements ApplicationListener {
 			prevDifY = 0.0f;
 			// reset Gesture
 			currentScene.onTouchUp();
-			if(hasControl)
-				last.set(-1, -1, -1);
+			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);
+		}
 	};
 /***********************************************************************************************************
@@ -1082,6 +1062,11 @@ public final class Stage implements ApplicationListener {
 * 					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){
@@ -1090,16 +1075,15 @@ public final class Stage implements ApplicationListener {
 	    return angle;
 	}
+	private static Vector2 distVector = new Vector2();
 	public static final float getDistance(Actor a, Actor b){
+		distVector.set(a.getX(), a.getY());
-		float dx = java.lang.Math.abs(a.getX() - b.getX());
+		return distVector.dst(b.getX(), b.getY());
-		float dy = java.lang.Math.abs(a.getY() - b.getY());
-		return (float)java.lang.Math.sqrt(dx*dx + dy*dy);
 	}
 	public static final float getDistance(float x1, float y1, float x2, float y2){
-		float dx = java.lang.Math.abs(x1 - x2);
+		distVector.set(x1, y1);
-		float dy = java.lang.Math.abs(y1 - y2);
-		return (float)java.lang.Math.sqrt(dx*dx + dy*dy);
+		return distVector.dst(x2, y2);
 	}
 	/*
@@ -1119,7 +1103,7 @@ public final class Stage implements ApplicationListener {
 		return text.substring(0, 1).toLowerCase()+text.substring(1);
 	}
-	public static Rectangle getBoundingBox(Actor actor) {
+	public static Rectangle getBounds(Actor actor) {
 		float posX = actor.getX();
 		float posY = actor.getY();
 		float width = actor.getWidth();
@@ -1128,7 +1112,7 @@ public final class Stage implements ApplicationListener {
 	}
 	public static boolean collides(Actor actor, float x, float y) {
-		Rectangle rectA1 = getBoundingBox(actor);
+		Rectangle rectA1 = getBounds(actor);
 		Rectangle rectA2 = new Rectangle(x, y, 5, 5);
 		// Check if rectangles collides
 		if (Intersector.overlaps(rectA1, rectA2)) {
@@ -1139,8 +1123,8 @@ public final class Stage implements ApplicationListener {
 	}
 	public static boolean collides(Actor actor1, Actor actor2) {
-		Rectangle rectA1 = getBoundingBox(actor1);
+		Rectangle rectA1 = getBounds(actor1);
-		Rectangle rectA2 = getBoundingBox(actor2);
+		Rectangle rectA2 = getBounds(actor2);
 		// Check if rectangles collides
 		if (Intersector.overlaps(rectA1, rectA2)) {
 			return true;
@@ -1152,18 +1136,18 @@ public final class Stage implements ApplicationListener {
 	/*
 	 * TEA Encryption and Decryption
 	 */
-	public static String teaKey = "Default";
+	public static String encryptKey = "Default";
-	private static final int delta = 0x9E3779B9;
+	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(), teaKey.getBytes());
+		return encrypt(data.getBytes(), encryptKey.getBytes());
 	}
 	public static final byte[] decrypt(String data) {
-		return decrypt(data.getBytes(), teaKey.getBytes());
+		return decrypt(data.getBytes(), encryptKey.getBytes());
 	}
 	public static final byte[] encrypt(String data, String key) {
@@ -1202,7 +1186,7 @@ public final class Stage implements ApplicationListener {
 		int p, q = 6 + 52 / (n + 1);
 		while (q-- > 0) {
-			sum = sum + delta;
+			sum = sum + encryptDelta;
 			e = sum >>> 2 & 3;
 	for (p = 0; p < n; p++) {
 		y = v[p + 1];
@@ -1229,7 +1213,7 @@ public final class Stage implements ApplicationListener {
 		int z = v[n], y = v[0], sum, e;
 		int p, q = 6 + 52 / (n + 1);
-		sum = q * delta;
+		sum = q * encryptDelta;
 		while (sum != 0) {
 			e = sum >>> 2 & 3;
 		for (p = n; p > 0; p--) {
@@ -1238,7 +1222,7 @@ public final class Stage implements ApplicationListener {
 		}
 		z = v[n];
 		y = v[0] -= MX(sum, y, z, p, e, k);
-		sum = sum - delta;
+		sum = sum - encryptDelta;
 		}
 		return v;
 	}

test/asset CHANGED Viewed

	@@ -1 +1 @@
1	- {font:"arial.fnt,font1.fnt,font2.fnt,font3.fnt,normal.fnt,",atlas:"~~charset~~.atlas,~~imageatlas~~.atlas,~~tic~~.atlas,",sound:"click.mp3,",music:""}
1	+ {font:"arial.fnt,font1.fnt,font2.fnt,font3.fnt,normal.fnt,",atlas:"imageatlas.atlas,tic.atlas,pack.atlas,charset.atlas,",sound:"click.mp3,",music:""}

test/atlas/charset.atlas CHANGED Viewed

@@ -3,311 +3,311 @@ charset.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
-porcalais
-  rotate: false
-  xy: 0, 4
-  size: 60, 60
+661
-  orig: 60, 60
-  offset: 0, 0
-  index: -1
-porsabra
-  rotate: false
-  xy: 60, 4
-  size: 60, 60
-  orig: 60, 60
-  offset: 0, 0
-  index: -1
-porgarett
-  rotate: false
-  xy: 120, 4
-  size: 60, 60
-  orig: 60, 60
-  offset: 0, 0
-  index: -1
-portiberon
   rotate: false
-  xy: 180, 4
+  xy: 643, 58
-  size: 60, 60
+  size: 6, 6
-  orig: 60, 60
+  orig: 6, 6
   offset: 0, 0
   index: -1
-poralfador
+662
   rotate: false
-  xy: 240, 4
+  xy: 620, 19
-  size: 60, 60
+  size: 6, 6
-  orig: 60, 60
+  orig: 6, 6
   offset: 0, 0
   index: -1
-porbaldarov
+663
   rotate: false
-  xy: 300, 4
+  xy: 627, 26
-  size: 60, 60
+  size: 6, 6
-  orig: 60, 60
+  orig: 6, 6
   offset: 0, 0
   index: -1
-porserpentknight
+771
   rotate: false
-  xy: 360, 4
+  xy: 636, 57
-  size: 60, 60
+  size: 7, 7
-  orig: 60, 60
+  orig: 7, 7
   offset: 0, 0
   index: -1
-porlord
+772
   rotate: false
-  xy: 420, 4
+  xy: 620, 25
-  size: 60, 60
+  size: 7, 7
-  orig: 60, 60
+  orig: 7, 7
   offset: 0, 0
   index: -1
-porwizard
+775
   rotate: false
-  xy: 480, 4
+  xy: 636, 50
-  size: 60, 60
+  size: 7, 7
-  orig: 60, 60
+  orig: 7, 7
   offset: 0, 0
   index: -1
-baldarov01
+alfador00
   rotate: false
   xy: 540, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-calais00
+alfador01
   rotate: false
-  xy: 540, 32
+  xy: 540, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-calais01
+baldarov00
   rotate: false
   xy: 540, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-earcher
+baldarov01
   rotate: false
   xy: 556, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-esoldier
+calais00
   rotate: false
   xy: 540, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-garett01
+calais01
   rotate: false
-  xy: 540, 0
+  xy: 540, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-garett00
+citizen
   rotate: false
-  xy: 556, 32
+  xy: 540, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-lord00
+earcher
   rotate: false
-  xy: 572, 48
+  xy: 556, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-lord01
+elemental
   rotate: false
   xy: 572, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-merman
+esoldier
   rotate: false
   xy: 556, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-psoldier
+garett00
   rotate: false
   xy: 556, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-sabra00
+garett01
   rotate: false
   xy: 572, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-sabra01
+lizardman
   rotate: false
-  xy: 572, 32
+  xy: 588, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-baldarov00
+lord00
   rotate: false
-  xy: 588, 48
+  xy: 572, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-mina
+lord01
   rotate: false
   xy: 572, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-citizen
+merman
   rotate: false
   xy: 572, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-serpentknight00
+mina
   rotate: false
   xy: 588, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-serpentknight01
+pguardian
   rotate: false
-  xy: 588, 32
+  xy: 604, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-shaka
+poralfador
   rotate: false
-  xy: 604, 48
+  xy: 0, 4
-  size: 16, 16
+  size: 60, 60
-  orig: 16, 16
+  orig: 60, 60
   offset: 0, 0
   index: -1
+porbaldarov
+  rotate: false
+  xy: 60, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porcalais
+  rotate: false
+  xy: 120, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porgarett
+  rotate: false
+  xy: 180, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porlord
+  rotate: false
+  xy: 240, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porsabra
+  rotate: false
+  xy: 300, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porserpentknight
+  rotate: false
+  xy: 360, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
-tribeman
+portiberon
+  rotate: false
+  xy: 420, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+porwizard
+  rotate: false
+  xy: 480, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+psoldier
   rotate: false
   xy: 588, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-alfador00
+sabra00
   rotate: false
   xy: 588, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-alfador01
+sabra01
   rotate: false
   xy: 588, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-tiberon00
+serpentknight00
   rotate: false
   xy: 604, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-tiberon01
+serpentknight01
   rotate: false
   xy: 604, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-pguardian
+shaka
   rotate: false
   xy: 620, 48
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-elemental
+tiberon00
   rotate: false
   xy: 604, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-wizard00
+tiberon01
   rotate: false
-  xy: 604, 0
+  xy: 604, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-wizard01
+tribeman
   rotate: false
   xy: 604, 0
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-lizardman
+wizard00
   rotate: false
   xy: 620, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-771
-  rotate: false
-  xy: 636, 57
-  size: 7, 7
+wizard01
-  orig: 7, 7
-  offset: 0, 0
-  index: -1
-772
-  rotate: false
-  xy: 620, 25
-  size: 7, 7
-  orig: 7, 7
-  offset: 0, 0
-  index: -1
-775
-  rotate: false
-  xy: 636, 50
-  size: 7, 7
-  orig: 7, 7
-  offset: 0, 0
-  index: -1
-661
-  rotate: false
-  xy: 643, 58
-  size: 6, 6
-  orig: 6, 6
-  offset: 0, 0
-  index: -1
-662
-  rotate: false
-  xy: 620, 19
-  size: 6, 6
-  orig: 6, 6
-  offset: 0, 0
-  index: -1
-663
   rotate: false
-  xy: 627, 26
+  xy: 620, 32
-  size: 6, 6
+  size: 16, 16
-  orig: 6, 6
+  orig: 16, 16
   offset: 0, 0
   index: -1

test/atlas/charset.png CHANGED Viewed

Binary file

test/atlas/pack.atlas ADDED Viewed

@@ -0,0 +1,325 @@
+pack.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+concrete
+  rotate: false
+  xy: 0, 0
+  size: 512, 512
+  orig: 512, 512
+  offset: 0, 0
+  index: -1
+pack2.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+charset/661
+  rotate: false
+  xy: 643, 58
+  size: 6, 6
+  orig: 6, 6
+  offset: 0, 0
+  index: -1
+charset/662
+  rotate: false
+  xy: 620, 19
+  size: 6, 6
+  orig: 6, 6
+  offset: 0, 0
+  index: -1
+charset/663
+  rotate: false
+  xy: 627, 26
+  size: 6, 6
+  orig: 6, 6
+  offset: 0, 0
+  index: -1
+charset/771
+  rotate: false
+  xy: 636, 57
+  size: 7, 7
+  orig: 7, 7
+  offset: 0, 0
+  index: -1
+charset/772
+  rotate: false
+  xy: 620, 25
+  size: 7, 7
+  orig: 7, 7
+  offset: 0, 0
+  index: -1
+charset/775
+  rotate: false
+  xy: 636, 50
+  size: 7, 7
+  orig: 7, 7
+  offset: 0, 0
+  index: -1
+charset/alfador00
+  rotate: false
+  xy: 540, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/alfador01
+  rotate: false
+  xy: 540, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/baldarov00
+  rotate: false
+  xy: 540, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/baldarov01
+  rotate: false
+  xy: 556, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/calais00
+  rotate: false
+  xy: 540, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/calais01
+  rotate: false
+  xy: 540, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/citizen
+  rotate: false
+  xy: 540, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/earcher
+  rotate: false
+  xy: 556, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/elemental
+  rotate: false
+  xy: 572, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/esoldier
+  rotate: false
+  xy: 556, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/garett00
+  rotate: false
+  xy: 556, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/garett01
+  rotate: false
+  xy: 572, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/lizardman
+  rotate: false
+  xy: 588, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/lord00
+  rotate: false
+  xy: 572, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/lord01
+  rotate: false
+  xy: 572, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/merman
+  rotate: false
+  xy: 572, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/mina
+  rotate: false
+  xy: 588, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/pguardian
+  rotate: false
+  xy: 604, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/poralfador
+  rotate: false
+  xy: 0, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porbaldarov
+  rotate: false
+  xy: 60, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porcalais
+  rotate: false
+  xy: 120, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porgarett
+  rotate: false
+  xy: 180, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porlord
+  rotate: false
+  xy: 240, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porsabra
+  rotate: false
+  xy: 300, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porserpentknight
+  rotate: false
+  xy: 360, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/portiberon
+  rotate: false
+  xy: 420, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/porwizard
+  rotate: false
+  xy: 480, 4
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+charset/psoldier
+  rotate: false
+  xy: 588, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/sabra00
+  rotate: false
+  xy: 588, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/sabra01
+  rotate: false
+  xy: 588, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/serpentknight00
+  rotate: false
+  xy: 604, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/serpentknight01
+  rotate: false
+  xy: 604, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/shaka
+  rotate: false
+  xy: 620, 48
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/tiberon00
+  rotate: false
+  xy: 604, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/tiberon01
+  rotate: false
+  xy: 604, 16
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/tribeman
+  rotate: false
+  xy: 604, 0
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/wizard00
+  rotate: false
+  xy: 620, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+charset/wizard01
+  rotate: false
+  xy: 620, 32
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1

test/atlas/pack.png ADDED Viewed

Binary file

test/atlas/pack2.png ADDED Viewed

Binary file

test/config CHANGED Viewed

@@ -2,8 +2,8 @@
 title: Game1,
 version: "0.45",
 hasIcon: true,
-targetSize: "860x650",
+targetSize: "800x480",
-screenSize: "860x650",
+screenSize: "800x480",
 audioBufferCount: "10",
 resize: "false",
 forceExit: "false",
@@ -15,5 +15,5 @@ keepAspectRatio: "false",
 showFPS: "true",
 loggingEnabled: "true",
 project: "C:/CODE/RpgIDE/test/",
-target: Android
+target: Desktop
 }

test/model/skydome.g3db ADDED Viewed

Binary file

test/model/skydome.png ADDED Viewed

Binary file

test/pack/charset/661.png ADDED Viewed

Binary file

test/pack/charset/662.png ADDED Viewed

Binary file

test/pack/charset/663.png ADDED Viewed

Binary file

test/pack/charset/771.png ADDED Viewed

Binary file

test/pack/charset/772.png ADDED Viewed

Binary file

test/pack/charset/775.png ADDED Viewed

Binary file

test/pack/charset/Thumbs.db ADDED Viewed

Binary file

test/pack/charset/alfador00.png ADDED Viewed

Binary file

test/pack/charset/alfador01.png ADDED Viewed

Binary file

test/pack/charset/baldarov00.png ADDED Viewed

Binary file

test/pack/charset/baldarov01.png ADDED Viewed

Binary file

test/pack/charset/calais00.png ADDED Viewed

Binary file

test/pack/charset/calais01.png ADDED Viewed

Binary file

test/pack/charset/citizen.png ADDED Viewed

Binary file

test/pack/charset/earcher.png ADDED Viewed

Binary file

test/pack/charset/elemental.png ADDED Viewed

Binary file

test/pack/charset/esoldier.png ADDED Viewed

Binary file

test/pack/charset/garett00.png ADDED Viewed

Binary file

test/pack/charset/garett01.png ADDED Viewed

Binary file

test/pack/charset/lizardman.png ADDED Viewed

Binary file

test/pack/charset/lord00.png ADDED Viewed

Binary file

test/pack/charset/lord01.png ADDED Viewed

Binary file

test/pack/charset/merman.png ADDED Viewed

Binary file

test/pack/charset/mina.png ADDED Viewed

Binary file

test/pack/charset/pguardian.png ADDED Viewed

Binary file

test/pack/charset/poralfador.png ADDED Viewed

Binary file

test/pack/charset/porbaldarov.png ADDED Viewed

Binary file

test/pack/charset/porcalais.png ADDED Viewed

Binary file

test/pack/charset/porgarett.png ADDED Viewed

Binary file

test/pack/charset/porlord.png ADDED Viewed

Binary file

test/pack/charset/porsabra.png ADDED Viewed

Binary file

test/pack/charset/porserpentknight.png ADDED Viewed

Binary file

test/pack/charset/portiberon.png ADDED Viewed

Binary file

test/pack/charset/porwizard.png ADDED Viewed

Binary file

test/pack/charset/psoldier.png ADDED Viewed

Binary file

test/pack/charset/sabra00.png ADDED Viewed

Binary file

test/pack/charset/sabra01.png ADDED Viewed

Binary file

test/pack/charset/serpentknight00.png ADDED Viewed

Binary file

test/pack/charset/serpentknight01.png ADDED Viewed

Binary file

test/pack/charset/shaka.png ADDED Viewed

Binary file

test/pack/charset/tiberon00.png ADDED Viewed

Binary file

test/pack/charset/tiberon01.png ADDED Viewed

Binary file

test/pack/charset/tribeman.png ADDED Viewed

Binary file

test/pack/charset/wizard00.png ADDED Viewed

Binary file

test/pack/charset/wizard01.png ADDED Viewed

Binary file

test/pack/concrete.png ADDED Viewed

Binary file

test/scene CHANGED Viewed

@@ -1,59 +1,57 @@
-{Splash:"{class:SceneJson,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Bounce}
-",Menu:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"FadeIn\",duration:1.0,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Options,x:251.96078,y:262,width:329,height:73.270874,color:ccccffff,ox:0,oy:0,rotation:0,text:Options,fontName:font2}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play,x:307.84314,y:406,width:199.86148,height:84,color:ffccccff,ox:0,oy:0,rotation:0,text:Play,fontName:font2}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Exit,x:316.6667,y:68,width:159,height:84,color:\"000000ff\",ox:0,oy:0,rotation:0,text:Exit,fontName:font1}
-{class:Sprite,name:Sprite1,x:41.176453,y:232,width:59.99997,height:60,color:ffffffff,ox:0,oy:0,rotation:0,textures:\"porgarett,portiberon\",duration:0.5,active:true,looping:true,frameCount:1}
-{class:ImageJson,name:Image1,x:200.6209,y:88,width:60,height:68.125,color:ffffffff,ox:0,oy:0,rotation:0,texName:porgarett,effect:PatrolX,value:50,duration:0.7,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:None}
-{class:ImageJson,name:ImageJson2,x:604.902,y:296,width:122,height:116,color:ffffffff,ox:0,oy:0,rotation:0,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson3,x:473.52942,y:422,width:325,height:60,color:ffffffff,ox:0,oy:0,rotation:0,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:ImageJson4,x:607.84314,y:263,width:40,height:40,color:ffffffff,ox:0,oy:0,rotation:0,texName:img_obj_snowflake,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:ImageJson5,x:565.6863,y:173,width:40,height:40,color:ffffffff,ox:0,oy:0,rotation:0,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:211.52426,y:1,width:325,height:60,color:ffffffff,ox:0,oy:0,rotation:0,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:122.54901,y:244,width:40,height:40,color:ffffffff,ox:0,oy:0,rotation:0,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:651.9608,y:7566.8667,width:40,height:40,color:ffffffff,ox:0,oy:0,rotation:0,texName:img_obj_snowflake,effect:PatrolY,value:600,duration:4,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:SceneCreated,onEvent:DoEffect,eventScene:\"\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Play3d,x:260.53268,y:345,width:287,height:67,color:ffcc00ff,ox:0,oy:0,rotation:0,text:Play3d,fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label3,x:304.90195,y:169,width:180,height:84,color:\"0707beff\",ox:0,oy:0,rotation:0,text:Help,fontName:font1}
-{class:ImageJson,name:ImageJson9,x:174.50981,y:338,width:60,height:60,color:ffffffff,ox:0,oy:0,rotation:0,texName:porcalais,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-",Options:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"downToUp\",duration:1.0,interpolation:Elastic}
-{class:ImageJson,name:Image1,x:63.725494,y:318,width:58.013855,height:69,color:ffffffff,ox:0,oy:0,rotation:0,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,color:ffffffff,ox:0,oy:0,rotation:0,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,color:ffffffff,ox:0,oy:0,rotation:0,text:\"Menu,Options,Exit,\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox1,x:599.213,y:448,width:58,height:25,color:ffffffff,ox:0,oy:0,rotation:0,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox2,x:596.836,y:407.62714,width:58,height:25,color:ffffffff,ox:0,oy:0,rotation:0,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox3,x:598.82214,y:368.56702,width:58,height:25,color:ffffffff,ox:0,oy:0,rotation:0,text:Check}
-{class:com.badlogic.gdx.scenes.scene2d.ui.CheckBox,name:CheckBox4,x:595.84296,y:330.50848,width:58,height:25,color:ffffffff,ox:0,oy:0,rotation:0,text:Check}
-{class:ImageJson,name:Image2,x:159.80391,y:318,width:60,height:60,color:ffffffff,ox:0,oy:0,rotation:0,texName:poralfador,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
-{class:ImageJson,name:Image3,x:55.882355,y:231,width:55.0347,height:64,color:ffffffff,ox:0,oy:0,rotation:0,texName:porbaldarov,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,color:ffffffff,ox:0,oy:0,rotation:0,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.TextButton,name:TextButton3,x:455.87964,y:363,width:87,height:27,color:ffffffff,ox:0,oy:0,rotation:0,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.TextButton,name:TextButton4,x:462.7714,y:324.49924,width:87,height:27,color:\"00ff00ff\",ox:0,oy:0,rotation:0,text:TextButton}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:315.68628,y:286,width:107.94458,height:51,color:ffffffff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button2,x:319.60785,y:348,width:101.986176,height:63,color:ff0000ff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.List,name:List2,x:698.12933,y:218,width:88.77136,height:100,color:ffffffff,ox:0,oy:0,rotation:0,text:\"First,New,Third,Options,\"}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Touchpad,name:Touchpad1,x:8.937653,y:21,width:200,height:200,color:ffffffff,ox:0,oy:0,rotation:0,deadzoneRadius:5}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Back,x:308,y:27,width:180,height:84,color:ffffffff,ox:0,oy:0,rotation:63.97888,text:Back,fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button3,x:625.4902,y:154,width:50,height:50,color:ffffffff,ox:0,oy:0,rotation:-75.012436}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Dialog,name:Dialog1,x:296.07843,y:134,width:188,height:131,color:ffffffff,ox:0,oy:0,rotation:0,title:Title,modal:false,move:true,resize:true}
-",Game:"{class:SceneJson,background:\"None\",music:\"None\",transition:\"None\",duration:1.0,interpolation:Exp10In}
-{class:ImageJson,name:Player,x:244,y:248,width:60,height:60,color:ffffffff,ox:0,oy:0,rotation:1.3639275,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,color:ffffffff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Back,x:335.29413,y:10,width:180,height:84,color:ffffffff,ox:0,oy:0,rotation:0,text:Back,fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Timer,x:30.392181,y:405,width:245,height:84,color:ffffffff,ox:0,oy:0,rotation:0,text:\"Timer:\",fontName:font1}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Left,x:21.568634,y:98,width:66.61896,height:58,color:ffffffff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Up,x:115.68628,y:162,width:69.59813,height:59,color:ffffffff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Down,x:110.7843,y:25,width:73.57042,height:57.999985,color:ffffffff,ox:0,oy:0,rotation:0}
-{class:ImageJson,name:Enemy,x:613.72546,y:326.4234,width:70.61896,height:59,color:ffffffff,ox:0,oy:0,rotation:0,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,color:ff6666ff,ox:0,oy:0,rotation:0}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label3,x:31.372559,y:375,width:473,height:31,color:\"000000ff\",ox:0,oy:0,rotation:0,text:\"Collide with enemy within 30 seconds\",fontName:arial}
-",GameWin:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"rightToLeft\",duration:1.0,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:245.09804,y:226,width:294,height:84,color:ffffffff,ox:0,oy:0,rotation:0,text:\"You Win\",fontName:font1}
-",GameOver:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"FadeOut\",duration:3.0,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:229.39955,y:341,width:339,height:84,color:ffffffff,text:\"You Lose\",fontName:font1}
-",Game3d:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"FadeIn\",duration:1.0,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Button,name:Button1,x:55.882355,y:81,width:50,height:50,color:ffffffff,ox:0,oy:0,rotation:0}
-",TicTacToe:"{class:SceneJson,background:\"None\",music:\"None\",transition:\"FadeIn\",duration:1.0,interpolation:Exp10In}
-{class:com.badlogic.gdx.scenes.scene2d.ui.Label,name:Label1,x:238.33719,y:553,width:380,height:84,color:\"000000ff\",ox:0,oy:0,rotation:0,text:TicTacToe,fontName:font1}
-",BasicDemo:"{class:SceneJson,background:\"img_bg_1_\",music:\"None\",transition:\"FadeIn\",duration:1.0,interpolation:Exp10In}
-{class:ImageJson,name:PauseButton,x:327.451,y:275,width:120,height:120,color:ffffffff,ox:0,oy:0,rotation:0,texName:img_btn_pause,effect:None,value:0,duration:0,interpolation:Linear,addActorDelay:0,addEffectDelay:0,event:None,onEvent:DoEffect,eventScene:\"\"}
+{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:\"\"}
+{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: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: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:\"\"}
 "}

test/source/BasicDemo.java CHANGED Viewed

@@ -4,12 +4,12 @@ import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
-/** A Basic Demo Game Scene
+/** A Basic Demo Game Scene
- * <p>
+ * <p>
- * This Scene showcases all the different features of the inbuilt Stage framework
+ * This Scene showcases all the different features of the inbuilt Stage framework
- * <p>
+ * <p>
- * @author pyros2097 */
+ * @author pyros2097 */
 public class BasicDemo extends Scene {
     Image pauseImage;
     Image pauseBtn;
@@ -50,6 +50,18 @@ public class BasicDemo extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause() {

test/source/Game.java CHANGED Viewed

@@ -86,6 +86,18 @@ public class Game extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause(){

test/source/Game3d.java CHANGED Viewed

@@ -1,12 +1,36 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.graphics.g3d.utils.MeshPartBuilder;
+import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder;
+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;
 public class Game3d extends Scene {
     Actor3d ship;
+    Actor3d skydome;
+    Actor3d knight;
+    Actor3d floor;
+    ModelBuilder builder;
     public Game3d(){
-       ship = Asset.loadModel("ship");
+       ship = Asset.loadModelObj("ship");//loads an obj model
        ship.scale(3f);
+       skydome = Asset.loadModel("skydome"); //loads a g3db model
+       builder = new ModelBuilder();
+       builder.begin();
+       MeshPartBuilder part = builder.part("floor", GL20.GL_TRIANGLES, Usage.Position |
+            Usage.TextureCoordinates | Usage.Normal, new Material());
+       for (float x = -200f; x < 200f; x += 10f) {
+           for (float z = -200f; z < 200f; z += 10f) {
+               part.rect(x, 0, z + 10f, x + 10f, 0, z + 10f, x + 10f, 0, z, x, 0, z, 0, 1, 0);
+           }
+       }
+       floor = new Actor3d(builder.end());
+       floor.materials.get(0).set(TextureAttribute.createDiffuse(Asset.tex("concrete").getTexture()));
+       Stage.addActor3d(floor);
+       Stage.addActor3d(skydome);
-       Stage.addActor3d(ship);
+       Stage.addActor3d(ship);
     }
     @Override
@@ -27,6 +51,18 @@ public class Game3d extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause(){
     }

test/source/GameOver.java CHANGED Viewed

@@ -1,10 +1,10 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
-/** A Basic Game Over Scene for the Game
+/** A Basic Game Over Scene for the Game
- * <p>
+ * <p>
- * The Game Scene displays that the player has lost the game and then switches to Menu
+ * The Game Scene displays that the player has lost the game and then switches to Menu
- * <p>
+ * <p>
- * @author pyros2097 */
+ * @author pyros2097 */
 public class GameOver extends Scene{
     public GameOver(){
@@ -25,6 +25,18 @@ public class GameOver extends Scene{
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause(){

test/source/GameWin.java CHANGED Viewed

@@ -1,10 +1,10 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
-/** A Basic Game Win Scene for the Game
+/** A Basic Game Win Scene for the Game
- * <p>
+ * <p>
- * The Game Scene displays that the player has won the game and then switches to Menu
+ * The Game Scene displays that the player has won the game and then switches to Menu
- * <p>
+ * <p>
- * @author pyros2097 */
+ * @author pyros2097 */
 public class GameWin extends Scene {
     public GameWin(){
@@ -25,6 +25,18 @@ public class GameWin extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause(){

test/source/Menu.java CHANGED Viewed

@@ -1,11 +1,11 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
-/** A Basic Main Menu for the Game
+/** A Basic Main Menu for the Game
- * <p>
+ * <p>
- * The Main Menu Displays all the scenes to which the game can switch too. Based on which button or
+ * 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>
+ * <p>
- * @author pyros2097 */
+ * @author pyros2097 */
 public class Menu extends Scene {
     public Menu(){
@@ -44,6 +44,18 @@ public class Menu extends Scene {
             Stage.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,12 +1,12 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
-/** A Basic Options Scene for the Game
+/** A Basic Options Scene for the Game
- * <p>
+ * <p>
- * The Options Scene displays the necessary settings which can be modified by the user like
+ * The Options Scene displays the necessary settings which can be modified by the user like
- * musicOn, soundOn, panCamera, battleAnimations etc. The widgets once changed must persist
+ * musicOn, soundOn, panCamera, battleAnimations etc. The widgets once changed must persist
- * the changes to the preferences which can be accessed by Config.prefs
+ * the changes to the preferences which can be accessed by Config.prefs
- * <p>
+ * <p>
- * @author pyros2097 */
+ * @author pyros2097 */
 public class Options extends Scene {
     public Options(){
@@ -30,6 +30,18 @@ public class Options extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @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

@@ -73,13 +73,25 @@ public class Splash extends Scene {
     @Override
     public void onGesture(GestureType type){}
-     @Override
+    @Override
-    public void onPause(){
+    public void onKeyTyped(char key){
     }
     @Override
-    public void onResume(){
+    public void onKeyUp(int keycode){
     }
+    @Override
+    public void onKeyDown(int keycode){
+    }
+    @Override
+    public void onPause(){
+    }
+    @Override
+    public void onResume(){
+    }
     @Override
     public void onDispose() {

test/source/TicTacToe.java CHANGED Viewed

@@ -7,7 +7,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import java.util.Random;
 /**
- *  A Basic TicTacToe Game
 Scene
+ *  A Basic TicTacToe Game
+ Scene
  *
  * @author pyros2097 */
 public class TicTacToe extends Scene {
@@ -144,6 +145,18 @@ public class TicTacToe extends Scene {
     @Override
     public void onGesture(GestureType type){}
+    @Override
+    public void onKeyTyped(char key){
+    }
+    @Override
+    public void onKeyUp(int keycode){
+    }
+    @Override
+    public void onKeyDown(int keycode){
+    }
     @Override
     public void onPause(){

~repos /gdx-studio

git clone https://pyrossh.dev/repos/gdx-studio.git Discussions: https://groups.google.com/g/rust-embed-devs

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

git clone https://pyrossh.dev/repos/gdx-studio.git
Discussions: https://groups.google.com/g/rust-embed-devs