From c60a1ad4f6aa4904e80280586b440a584b5ff061 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 15:17:45 -0400
Subject: [PATCH] Refactoring phase 2
---
GrafreeD.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/GrafreeD.java b/GrafreeD.java
index ea65a13..ada5f76 100644
--- a/GrafreeD.java
+++ b/GrafreeD.java
@@ -50,7 +50,7 @@
universe.material = new cMaterial();
//god.addChild(universe);
universe.name = "Applet";
- theApplet3D = this;
+ grafreeD = this;
}
/**/
@@ -742,24 +742,28 @@
try
{
MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
- //MetalLookAndFeel.setCurrentTheme(new Theme(Constants.beigeTheme));
+ MetalLookAndFeel.setCurrentTheme(new Theme(Constants.yellowTheme));
UIManager.setLookAndFeel(new MetalLookAndFeel());
+ //UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+ //UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
+ //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
} catch (Exception e)
{
}
//Monitor mon=MonitorFactory.start("myFirstMonitor");
standAlone = true;
- theApplet3D = new GrafreeD();
- theApplet3D.universe = new Composite();
- theApplet3D.universe.name = "Scene";
- theApplet3D.universe.material = new cMaterial();
+ grafreeD = new GrafreeD();
+ grafreeD.universe = new Composite();
+ grafreeD.universe.name = "Scene";
+ grafreeD.universe.material = new cMaterial();
// theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
- theApplet3D.universe.root = true;
- theApplet3D.universe.openEditWindow(null, true); //, true);
+ grafreeD.universe.root = true;
+ grafreeD.universe.openEditWindow(null, true); //, true);
//mon.stop();
//System.out.println(mon);
+ //timeflow.app.TimeflowAppLauncher.GetTimeFlow();
}
// Timer callback
@@ -984,7 +988,7 @@
} while (avail > 0 && numRead >= 0);
return new String(data, 0, pos, "US-ASCII");
}
- public static GrafreeD theApplet3D;
+ public static GrafreeD grafreeD;
public static boolean standAlone = true;
public Composite universe;
public static Object3D clipboard = new Object3D();
--
Gitblit v1.6.2