From 07750666120cf38c7ad4f3a3a583a8c4d582bb0e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 23 Apr 2019 22:30:47 -0400
Subject: [PATCH] Cross-platform main.
---
ObjEditor.java | 133 ++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 42 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 6877515..cad3c8b 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -28,7 +28,12 @@
iSendInfo
//KeyListener
{
+ boolean timeline;
+ boolean wasFullScreen;
+ GroupEditor callee;
+ JFrame frame;
+
// SCRIPT
transient JFrame textpanel = null;
@@ -119,14 +124,13 @@
void keyPressed(int key, int modifiers)
{
System.out.println("KEY PRESSED");
- CameraPane.theRenderer.keyPressed(key, modifiers);
+ Globals.theRenderer.keyPressed(key, modifiers);
}
*/
static GridBagConstraints aConstraints;
static GridBagConstraints aWindowConstraints;
- GroupEditor callee;
- JFrame frame;
+
static int GRIDWIDTH = 100; // 4;
public void closeUI()
@@ -158,12 +162,16 @@
objEditor.ctrlPanel.remove(slowerButton);
objEditor.ctrlPanel.remove(fasterButton);
objEditor.ctrlPanel.remove(remarkButton);
+
+ Remove(normalpushField);
}
public ObjEditor GetEditor()
{
return objEditor; //.GetEditor();
}
+
+ // Sometimes myself, sometimes my callee's.
ObjEditor objEditor;
/*
@@ -238,7 +246,7 @@
//if (!isDisplayable())
//setUndecorated(true);
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
client = inClient;
copy = localCopy;
copy.editWindow = this;
@@ -292,18 +300,18 @@
//normalLensItem.addActionListener(this);
cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
revertCameraItem.addActionListener(this);
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
toggleFullScreenItem.addItemListener(this);
toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
- toggleTimelineItem.addItemListener(this);
cameraMenu.add("-");
cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
toggleTextureItem.addItemListener(this);
toggleTextureItem.setState(CameraPane.textureon);
cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
toggleLiveItem.addItemListener(this);
- toggleLiveItem.setState(CameraPane.isLIVE());
+ toggleLiveItem.setState(Globals.isLIVE());
cameraMenu.add(stepItem = new MenuItem("Step"));
stepItem.addActionListener(this);
// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
@@ -596,6 +604,22 @@
}
}
+ void ToggleFullScreen()
+ {
+ if (CameraPane.FULLSCREEN)
+ {
+ frame.getContentPane().remove(/*"Center",*/bigThree);
+ framePanel.add(bigThree);
+ frame.getContentPane().add(/*"Center",*/framePanel);
+ } else
+ {
+ frame.getContentPane().remove(/*"Center",*/framePanel);
+ framePanel.remove(bigThree);
+ frame.getContentPane().add(/*"Center",*/bigThree);
+ }
+ cameraView.ToggleFullScreen();
+ }
+
private JTextArea createTextPane()
{
String[] initString =
@@ -796,7 +820,7 @@
aConstraints.fill = GridBagConstraints.VERTICAL;
jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
- aConstraints.gridwidth = 2;
+ aConstraints.gridwidth = 1;
ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
aConstraints.gridx += 1;
aConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -965,6 +989,9 @@
Return();
+ normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
+ Return();
+
// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
// ObjEditor.aConstraints.gridx += 1;
@@ -1164,6 +1191,13 @@
timelinePanel = new JPanel(new BorderLayout());
timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
+ cameraPanel.setContinuousLayout(true);
+ cameraPanel.setOneTouchExpandable(true);
+// cameraPanel.setDividerLocation(0.9);
+// cameraPanel.setDividerSize(9);
+ cameraPanel.setResizeWeight(1.0);
+
centralPanel.add(cameraView);
//frame.setJMenuBar(timelineMenubar);
//centralPanel.add(timelinePanel);
@@ -1337,7 +1371,8 @@
//worldPane.add(bigPanel);
//worldPane.add(worldPanel);
/**/
- frame.getContentPane().add(/*"Center",*/framePanel);
+ //frame.getContentPane().add(/*"Center",*/framePanel);
+ frame.add(/*"Center",*/framePanel);
//frame.getContentPane().add(/*"Center",*/ worldPane);
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
@@ -1428,7 +1463,7 @@
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
//aConstraints.weightx = 0;
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1438,7 +1473,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1448,7 +1483,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1458,7 +1493,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1468,7 +1503,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1537,7 +1572,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1606,7 +1641,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -1677,7 +1712,7 @@
aConstraints.fill = GridBagConstraints.HORIZONTAL;
aConstraints.gridx += 1;
aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
+ ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
aConstraints.gridx = 0;
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
@@ -2966,37 +3001,35 @@
return;
} else if (event.getSource() == toggleTimelineItem)
{
- copy.timeline ^= true;
+ timeline ^= true;
- if (copy.timeline)
+ if (timeline)
{
centralPanel.remove(cameraView);
- centralPanel.add(timelinePanel);
+ cameraPanel.add(cameraView);
+ centralPanel.add(cameraPanel);
frame.setJMenuBar(timelineMenubar);
+ wasFullScreen = CameraPane.FULLSCREEN;
+ if (!CameraPane.FULLSCREEN)
+ ToggleFullScreen();
+ toggleFullScreenItem.setEnabled(false);
}
else
{
- centralPanel.remove(timelinePanel);
+ centralPanel.remove(cameraPanel);
centralPanel.add(cameraView);
frame.setJMenuBar(null);
+ if (!wasFullScreen)
+ ToggleFullScreen();
+ toggleFullScreenItem.setEnabled(true);
}
frame.validate();
return;
} else if (event.getSource() == toggleFullScreenItem)
{
- if (CameraPane.FULLSCREEN)
- {
- frame.getContentPane().remove(/*"Center",*/bigThree);
- framePanel.add(bigThree);
- frame.getContentPane().add(/*"Center",*/framePanel);
- } else
- {
- frame.getContentPane().remove(/*"Center",*/framePanel);
- frame.getContentPane().add(/*"Center",*/bigThree);
- }
+ ToggleFullScreen();
frame.validate();
- cameraView.ToggleFullScreen();
return;
} else if (event.getSource() == toggleRandomItem)
@@ -3106,7 +3139,8 @@
objEditor.refreshContents();
} else if (event.getSource() == stepItem)
{
- cameraView.ONESTEP = true;
+ //cameraView.ONESTEP = true;
+ Globals.ONESTEP = true;
cameraView.repaint();
return;
} else if (event.getSource() == stepButton)
@@ -3263,25 +3297,25 @@
void ToggleAnimation()
{
- if (!CameraPane.ANIMATION)
+ if (!Globals.ANIMATION)
{
FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
browser.show();
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
- CameraPane.filename = browser.getDirectory() + filename;
+ Globals.filename = browser.getDirectory() + filename;
//CameraPane.framecount = 0;
- CameraPane.imagecount = 0;
+ Globals.imagecount = 0;
- CameraPane.ANIMATION ^= true;
+ Globals.ANIMATION ^= true;
GrafreeD.wav.cursor = 0;
GrafreeD.wav.loop = 0;
}
} else
{
- CameraPane.ANIMATION ^= true;
+ Globals.ANIMATION ^= true;
}
}
@@ -3534,7 +3568,13 @@
//System.out.println("PARENT = " + parent);
//if (parent != null)
// parent.applySelf();
- refreshContents();
+ if (e.getSource() == normalpushField)
+ {
+ objEditor.refreshContents();
+ //Refresh();
+ }
+ else
+ refreshContents();
// ??? client.refreshEditWindow();
}
//else
@@ -3546,7 +3586,7 @@
//group.name = nameField.getText();
//objEditor.applySelf();
- assert (objEditor == this);
+ // OCT2018: assert (objEditor == this);
if (copy.selection == null || copy.selection.size() == 0)
//super.applySelf()
; else
@@ -3570,12 +3610,18 @@
objEditor.copy = keep;
}
}
+
+ if (normalpushField != null)
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
}
void SnapObject()
{
- Object3D obj = (Object3D)copy.selection.elementAt(0);
- SnapObject(obj);
+ if (copy.selection.size() > 0)
+ {
+ Object3D obj = (Object3D)copy.selection.elementAt(0);
+ SnapObject(obj);
+ }
}
void SnapObject(Object3D obj)
@@ -4499,6 +4545,7 @@
JPanel bigThree;
JTabbedPane scenePanel;
JPanel centralPanel;
+ JSplitPane cameraPanel;
JPanel timelinePanel;
JMenuBar timelineMenubar;
JSplitPane framePanel;
@@ -4611,4 +4658,6 @@
NumberSlider opacityPowerField;
JTree jTree;
//ObjectUI parent;
+
+ NumberSlider normalpushField;
}
--
Gitblit v1.6.2