~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -44,61 +44,47 @@
44	44
45	45	cButton GetButton(String name, boolean border)
46	46	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
56	49	}
57	50
58	51	cToggleButton GetToggleButton(String name, boolean border)
59	52	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
69	55	}
70	56
71	57	cCheckBox GetCheckBox(String name, boolean border)
72	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
73	65	try
74	66	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
77	83	}
78	84	catch (Exception e)
79	85	{
80		- return new cCheckBox(name, border);
	86	+ return null;
81	87	}
82		- }
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
85		- {
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
89		- {
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
98		- }
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
102	88	}
103	89
104	90	// SCRIPT
..	..	@@ -282,6 +268,12 @@
282	268	client = inClient;
283	269	copy = client;
284	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
285	277	// "this" is not called: SetupUI2(objEditor);
286	278	}
287	279
..	..	@@ -295,6 +287,12 @@
295	287	client = inClient;
296	288	copy = client;
297	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
298	296	SetupUI2(callee.GetEditor());
299	297	}
300	298
..	..	@@ -327,6 +325,12 @@
327	325	copy = localCopy;
328	326	copy.editWindow = this;
329	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
330	334	SetupMenu();
331	335
332	336	//SetupName(objEditor); // new
..	..	@@ -419,11 +423,12 @@
419	423
420	424	toolbarPanel = new JPanel();
421	425	toolbarPanel.setName("Toolbar");
	426	+
422	427	treePanel = new cGridBag();
423	428	treePanel.setName("Tree");
424	429
425	430	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
427	432
428	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	434
..	..	@@ -432,10 +437,10 @@
432	437	editPanel.add(ctrlPanel);
433	438
434	439	toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	440	+ //toolboxPanel.setName("Toolbox");
436	441
437	442	materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
439	444
440	445	/JTextPane/
441	446	infoarea = createTextPane();
..	..	@@ -443,6 +448,7 @@
443	448
444	449	infoarea.setEditable(true);
445	450	SetText();
	451	+
446	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	453	// infoarea.setOpaque(false);
448	454	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +456,7 @@
450	456	// TEXTAREA infoarea.setWrapStyleWord(true);
451	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	458	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	459	+ //infoPanel.setName("Info");
454	460	//infoPanel.setLayout(new BorderLayout());
455	461	//infoPanel.add(createTextPane());
456	462
..	..	@@ -815,6 +821,28 @@
815	821	}
816	822	frame.validate();
817	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
818	846
819	847	private JTextPane createTextPane()
820	848	{
..	..	@@ -1452,6 +1480,7 @@
1452	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1455	1484
1456	1485	/*
1457	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1489,16 +1518,23 @@
1489	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1519	//tmp.setName("Edit");
1491	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1492	1522	// JPanel north = new JPanel(new BorderLayout());
1493	1523	// north.setName("Edit");
1494	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1525	// objectPanel.add(north);
1496	1526	objectPanel.add(editPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1497	1528
1498	1529	//if (Globals.ADVANCED)
1499	1530	objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1500	1535
1501	1536	objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1502	1538
1503	1539	/*
1504	1540	aConstraints.gridx = 0;
..	..	@@ -1519,7 +1555,7 @@
1519	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1520	1556
1521	1557	/JTabbedPane/ scenePanel = new cGridBag();
1522		- scenePanel.preferredWidth = 6;
	1558	+ scenePanel.preferredWidth = 5;
1523	1559
1524	1560	JTabbedPane tabbedPane = new JTabbedPane();
1525	1561	tabbedPane.add(scrollpane);
..	..	@@ -1597,7 +1633,7 @@
1597	1633	bigThree = new cGridBag();
1598	1634	bigThree.addComponent(scenePanel);
1599	1635	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1601	1637
1602	1638	// // SIDE EFFECT!!!
1603	1639	// aConstraints.gridx = 0;
..	..	@@ -3574,11 +3610,11 @@
3574	3610	return null;
3575	3611	}
3576	3612
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	3613
3579	3614	public void Save()
3580	3615	{
3581		- Save(true);
	3616	+ //Save(true);
	3617	+ Replace();
3582	3618	}
3583	3619
3584	3620	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,25 +3633,20 @@
3597	3633	return true;
3598	3634	}
3599	3635
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
3600	3638	public boolean Save(boolean user)
3601	3639	{
3602	3640	System.err.println("Save");
3603	3641
3604	3642	cRadio tab = GetCurrentTab();
3605	3643
3606		- boolean temp = CameraPane.SWITCH;
3607		- CameraPane.SWITCH = false;
3608		-
3609		- copy.ExtractBigData(hashtable);
3610		-
3611		- byte[] compress = Compress(copy);
3612		-
3613		- CameraPane.SWITCH = temp;
	3644	+ byte[] compress = CompressCopy();
3614	3645
3615	3646	boolean thesame = false;
3616	3647
3617	3648	// Quick heuristic using length. Works only when stream is compressed.
3618		- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3619	3650	{
3620	3651	thesame = true;
3621	3652	}
..	..	@@ -3623,23 +3654,23 @@
3623	3654	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	3655	if (!thesame)
3625	3656	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3628	3659
3629		- tab.graphs[tab.undoindex] = compress;
	3660	+ copy.versions[++copy.versionindex] = compress;
3630	3661
3631		- if (increment)
3632		- tab.undoindex++;
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
3633	3664	}
3634	3665
3635		- copy.RestoreBigData(hashtable);
	3666	+ //copy.RestoreBigData(versiontable);
3636	3667
3637	3668	//assert(hashtable.isEmpty());
3638	3669
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3640	3671	{
3641	3672	//tab.user[i] = false;
3642		- // tab.graphs[i] = null;
	3673	+ copy.versions[i] = null;
3643	3674	}
3644	3675
3645	3676	SetUndoStates();
..	..	@@ -3649,7 +3680,7 @@
3649	3680	{
3650	3681	try
3651	3682	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	3684	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	3685
3655	3686	p.writeObject(copy);
..	..	@@ -3673,7 +3704,7 @@
3673	3704	boolean temp = CameraPane.SWITCH;
3674	3705	CameraPane.SWITCH = false;
3675	3706
3676		- copy.ExtractBigData(hashtable);
	3707	+ copy.ExtractBigData(versiontable);
3677	3708
3678	3709	copy.clear();
3679	3710
..	..	@@ -3682,7 +3713,7 @@
3682	3713	copy.add(obj.get(i));
3683	3714	}
3684	3715
3685		- copy.RestoreBigData(hashtable);
	3716	+ copy.RestoreBigData(versiontable);
3686	3717
3687	3718	CameraPane.SWITCH = temp;
3688	3719
..	..	@@ -3710,64 +3741,129 @@
3710	3741	}
3711	3742
3712	3743	cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
3713	3746	cButton redoButton;
3714	3747
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
	3751	+ {
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
3715	3763	void SetUndoStates()
3716	3764	{
3717	3765	cRadio tab = GetCurrentTab();
3718	3766
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
3721	3777	}
3722	3778
3723	3779	public boolean Undo()
3724	3780	{
	3781	+ // Option?
	3782	+ Replace();
	3783	+
3725	3784	System.err.println("Undo");
3726	3785
3727	3786	cRadio tab = GetCurrentTab();
3728	3787
3729		- if (tab.undoindex == 0)
	3788	+ if (copy.versionindex == 0)
3730	3789	{
3731	3790	java.awt.Toolkit.getDefaultToolkit().beep();
3732	3791	return false;
3733	3792	}
3734	3793
3735		- if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3736	3821	{
3737		- if (Save(false))
3738		- tab.undoindex -= 1;
3739		- else
3740		- {
3741		- if (tab.undoindex <= 0)
3742		- return false;
3743		- else
3744		- tab.undoindex -= 1;
3745		- }
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
3746	3824	}
3747	3825
3748		- tab.undoindex -= 1;
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
3749	3830
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
3751	3844
3752	3845	return true;
3753	3846	}
3754	3847
3755	3848	public void Redo()
3756	3849	{
	3850	+ // Option?
	3851	+ Replace();
	3852	+
3757	3853	cRadio tab = GetCurrentTab();
3758	3854
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
3760	3856	{
3761	3857	java.awt.Toolkit.getDefaultToolkit().beep();
3762	3858	return;
3763	3859	}
3764	3860
3765		- tab.undoindex += 1;
	3861	+ copy.versionindex += 1;
3766	3862
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3768	3864
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
3771	3867	}
3772	3868
3773	3869	void ImportGFD()
..	..	@@ -4063,9 +4159,25 @@
4063	4159	//copy.Touch();
4064	4160	}
4065	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
4066	4164	public void stateChanged(ChangeEvent e)
4067	4165	{
4068	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
4069	4181
4070	4182	if (freezematerial)
4071	4183	{
..	..	@@ -4414,7 +4526,7 @@
4414	4526
4415	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	4528	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	4530	Save();
4419	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4786,6 +4898,17 @@
4786	4898	c.addChild(csg);
4787	4899	}
4788	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4789	4912	ResetModel();
4790	4913	copy.HardTouch(); // recompile?
4791	4914	refreshContents();