diff --git a/data/projectRegistry.bson b/data/projectRegistry.bson index 3e5eb59..aa833ff 100644 --- a/data/projectRegistry.bson +++ b/data/projectRegistry.bson @@ -1,3 +1,3 @@ { projects -string test +string new scene stuff makings } diff --git a/data/projects/test/data/animations/intro.anim b/data/projects/new scene stuff makings/data/animations/intro.anim similarity index 100% rename from data/projects/test/data/animations/intro.anim rename to data/projects/new scene stuff makings/data/animations/intro.anim diff --git a/data/projects/test/data/icon.png b/data/projects/new scene stuff makings/data/icon.png similarity index 100% rename from data/projects/test/data/icon.png rename to data/projects/new scene stuff makings/data/icon.png diff --git a/data/projects/test/data/images/player/idleE.png b/data/projects/new scene stuff makings/data/images/player/idleE.png similarity index 100% rename from data/projects/test/data/images/player/idleE.png rename to data/projects/new scene stuff makings/data/images/player/idleE.png diff --git a/data/projects/test/data/images/player/idleN.png b/data/projects/new scene stuff makings/data/images/player/idleN.png similarity index 100% rename from data/projects/test/data/images/player/idleN.png rename to data/projects/new scene stuff makings/data/images/player/idleN.png diff --git a/data/projects/test/data/images/player/idleS.png b/data/projects/new scene stuff makings/data/images/player/idleS.png similarity index 100% rename from data/projects/test/data/images/player/idleS.png rename to data/projects/new scene stuff makings/data/images/player/idleS.png diff --git a/data/projects/test/data/images/player/idleW.png b/data/projects/new scene stuff makings/data/images/player/idleW.png similarity index 100% rename from data/projects/test/data/images/player/idleW.png rename to data/projects/new scene stuff makings/data/images/player/idleW.png diff --git a/data/projects/test/data/images/player/walkE.png b/data/projects/new scene stuff makings/data/images/player/walkE.png similarity index 100% rename from data/projects/test/data/images/player/walkE.png rename to data/projects/new scene stuff makings/data/images/player/walkE.png diff --git a/data/projects/test/data/images/player/walkN.png b/data/projects/new scene stuff makings/data/images/player/walkN.png similarity index 100% rename from data/projects/test/data/images/player/walkN.png rename to data/projects/new scene stuff makings/data/images/player/walkN.png diff --git a/data/projects/test/data/images/player/walkS.png b/data/projects/new scene stuff makings/data/images/player/walkS.png similarity index 100% rename from data/projects/test/data/images/player/walkS.png rename to data/projects/new scene stuff makings/data/images/player/walkS.png diff --git a/data/projects/test/data/images/player/walkW.png b/data/projects/new scene stuff makings/data/images/player/walkW.png similarity index 100% rename from data/projects/test/data/images/player/walkW.png rename to data/projects/new scene stuff makings/data/images/player/walkW.png diff --git a/data/projects/test/data/images/trident/box.png b/data/projects/new scene stuff makings/data/images/trident/box.png similarity index 100% rename from data/projects/test/data/images/trident/box.png rename to data/projects/new scene stuff makings/data/images/trident/box.png diff --git a/data/projects/test/data/images/trident/boxColl.png b/data/projects/new scene stuff makings/data/images/trident/boxColl.png similarity index 100% rename from data/projects/test/data/images/trident/boxColl.png rename to data/projects/new scene stuff makings/data/images/trident/boxColl.png diff --git a/data/projects/test/data/images/trident/collision.png b/data/projects/new scene stuff makings/data/images/trident/collision.png similarity index 100% rename from data/projects/test/data/images/trident/collision.png rename to data/projects/new scene stuff makings/data/images/trident/collision.png diff --git a/data/projects/test/data/images/trident/consolebg.png b/data/projects/new scene stuff makings/data/images/trident/consolebg.png similarity index 100% rename from data/projects/test/data/images/trident/consolebg.png rename to data/projects/new scene stuff makings/data/images/trident/consolebg.png diff --git a/data/projects/test/data/images/trident/customEnt.png b/data/projects/new scene stuff makings/data/images/trident/customEnt.png similarity index 100% rename from data/projects/test/data/images/trident/customEnt.png rename to data/projects/new scene stuff makings/data/images/trident/customEnt.png diff --git a/data/projects/test/data/images/trident/light.png b/data/projects/new scene stuff makings/data/images/trident/light.png similarity index 100% rename from data/projects/test/data/images/trident/light.png rename to data/projects/new scene stuff makings/data/images/trident/light.png diff --git a/data/projects/test/data/images/trident/plrStart.png b/data/projects/new scene stuff makings/data/images/trident/plrStart.png similarity index 100% rename from data/projects/test/data/images/trident/plrStart.png rename to data/projects/new scene stuff makings/data/images/trident/plrStart.png diff --git a/data/projects/test/data/images/trident/splash.png b/data/projects/new scene stuff makings/data/images/trident/splash.png similarity index 100% rename from data/projects/test/data/images/trident/splash.png rename to data/projects/new scene stuff makings/data/images/trident/splash.png diff --git a/data/projects/test/data/images/trident/trigger.png b/data/projects/new scene stuff makings/data/images/trident/trigger.png similarity index 100% rename from data/projects/test/data/images/trident/trigger.png rename to data/projects/new scene stuff makings/data/images/trident/trigger.png diff --git a/data/projects/test/data/scenes/default.bson b/data/projects/new scene stuff makings/data/scenes/default.bson similarity index 72% rename from data/projects/test/data/scenes/default.bson rename to data/projects/new scene stuff makings/data/scenes/default.bson index db16038..d98016b 100644 --- a/data/projects/test/data/scenes/default.bson +++ b/data/projects/new scene stuff makings/data/scenes/default.bson @@ -8,8 +8,8 @@ int 255 } { entities string boxcoll -double -200.0 -double 0.0 +double -200 +double 0 boolean true int 100 int 100 @@ -17,18 +17,18 @@ int 0 int 255 int 0 string plrstart -double -300.0 -double 0.0 +double -300 +double 0 boolean false string inviscoll -double -200.0 -double 100.0 +double -200 +double 100 boolean true int 100 int 100 string boxnocoll -double -200.0 -double -100.0 +double -200 +double -100 boolean false int 100 int 100 @@ -36,8 +36,8 @@ int 255 int 0 int 0 string light -double -200.0 -double 200.0 +double -200 +double 200 boolean false int 100 } diff --git a/data/projects/test/lib/BLib.jar b/data/projects/new scene stuff makings/lib/BLib.jar similarity index 87% rename from data/projects/test/lib/BLib.jar rename to data/projects/new scene stuff makings/lib/BLib.jar index 99e9d99..558b0ae 100644 Binary files a/data/projects/test/lib/BLib.jar and b/data/projects/new scene stuff makings/lib/BLib.jar differ diff --git a/data/projects/test/lib/JHLabs Filters.jar b/data/projects/new scene stuff makings/lib/JHLabs Filters.jar similarity index 100% rename from data/projects/test/lib/JHLabs Filters.jar rename to data/projects/new scene stuff makings/lib/JHLabs Filters.jar diff --git a/data/projects/test/src/ent/ExampleEntity.java b/data/projects/new scene stuff makings/src/ent/ExampleEntity.java similarity index 100% rename from data/projects/test/src/ent/ExampleEntity.java rename to data/projects/new scene stuff makings/src/ent/ExampleEntity.java diff --git a/data/projects/test/src/trident/Main.java b/data/projects/new scene stuff makings/src/trident/Main.java similarity index 100% rename from data/projects/test/src/trident/Main.java rename to data/projects/new scene stuff makings/src/trident/Main.java diff --git a/data/projects/test/src/trident/MainPanel.java b/data/projects/new scene stuff makings/src/trident/MainPanel.java similarity index 99% rename from data/projects/test/src/trident/MainPanel.java rename to data/projects/new scene stuff makings/src/trident/MainPanel.java index 20afddf..8fffdd7 100644 --- a/data/projects/test/src/trident/MainPanel.java +++ b/data/projects/new scene stuff makings/src/trident/MainPanel.java @@ -102,6 +102,7 @@ public class MainPanel extends JPanel { if(key == KeyEvent.VK_F11){ Trident.fullscreen = !Trident.fullscreen; Main.window = BTools.getWindowFullscreen(Main.window, Trident.fullscreen, panel); + Update.tridentEvent(Trident.EVENT_FULLSCREEN); return; } if(!inIntro){ diff --git a/data/projects/test/src/trident/RenderingThread.java b/data/projects/new scene stuff makings/src/trident/RenderingThread.java similarity index 100% rename from data/projects/test/src/trident/RenderingThread.java rename to data/projects/new scene stuff makings/src/trident/RenderingThread.java diff --git a/data/projects/test/src/trident/Scene.java b/data/projects/new scene stuff makings/src/trident/Scene.java similarity index 100% rename from data/projects/test/src/trident/Scene.java rename to data/projects/new scene stuff makings/src/trident/Scene.java diff --git a/data/projects/test/src/trident/TridEntity.java b/data/projects/new scene stuff makings/src/trident/TridEntity.java similarity index 100% rename from data/projects/test/src/trident/TridEntity.java rename to data/projects/new scene stuff makings/src/trident/TridEntity.java diff --git a/data/projects/test/src/trident/Trident.java b/data/projects/new scene stuff makings/src/trident/Trident.java similarity index 99% rename from data/projects/test/src/trident/Trident.java rename to data/projects/new scene stuff makings/src/trident/Trident.java index 695f873..ab3bef8 100644 --- a/data/projects/test/src/trident/Trident.java +++ b/data/projects/new scene stuff makings/src/trident/Trident.java @@ -54,7 +54,7 @@ public class Trident { protected static String newSprite = null; // Trident events - public static final int EVENT_SCREENSHOT = 0; + public static final int EVENT_SCREENSHOT = 0, EVENT_FULLSCREEN = 1; // Setting methods diff --git a/data/projects/test/src/trident/ent/BoxColl.java b/data/projects/new scene stuff makings/src/trident/ent/BoxColl.java similarity index 100% rename from data/projects/test/src/trident/ent/BoxColl.java rename to data/projects/new scene stuff makings/src/trident/ent/BoxColl.java diff --git a/data/projects/test/src/trident/ent/BoxNoColl.java b/data/projects/new scene stuff makings/src/trident/ent/BoxNoColl.java similarity index 100% rename from data/projects/test/src/trident/ent/BoxNoColl.java rename to data/projects/new scene stuff makings/src/trident/ent/BoxNoColl.java diff --git a/data/projects/test/src/trident/ent/InvisColl.java b/data/projects/new scene stuff makings/src/trident/ent/InvisColl.java similarity index 100% rename from data/projects/test/src/trident/ent/InvisColl.java rename to data/projects/new scene stuff makings/src/trident/ent/InvisColl.java diff --git a/data/projects/test/src/trident/ent/PlrStart.java b/data/projects/new scene stuff makings/src/trident/ent/PlrStart.java similarity index 100% rename from data/projects/test/src/trident/ent/PlrStart.java rename to data/projects/new scene stuff makings/src/trident/ent/PlrStart.java diff --git a/data/projects/test/src/trident/ent/TridLight.java b/data/projects/new scene stuff makings/src/trident/ent/TridLight.java similarity index 100% rename from data/projects/test/src/trident/ent/TridLight.java rename to data/projects/new scene stuff makings/src/trident/ent/TridLight.java diff --git a/data/projects/test/src/trident/ent/Trigger.java b/data/projects/new scene stuff makings/src/trident/ent/Trigger.java similarity index 100% rename from data/projects/test/src/trident/ent/Trigger.java rename to data/projects/new scene stuff makings/src/trident/ent/Trigger.java diff --git a/data/projects/test/src/update/Inputs.java b/data/projects/new scene stuff makings/src/update/Inputs.java similarity index 100% rename from data/projects/test/src/update/Inputs.java rename to data/projects/new scene stuff makings/src/update/Inputs.java diff --git a/data/projects/test/src/update/Update.java b/data/projects/new scene stuff makings/src/update/Update.java similarity index 100% rename from data/projects/test/src/update/Update.java rename to data/projects/new scene stuff makings/src/update/Update.java diff --git a/data/templates/blank2d/src/trident/MainPanel.java b/data/templates/blank2d/src/trident/MainPanel.java index 20afddf..8fffdd7 100644 --- a/data/templates/blank2d/src/trident/MainPanel.java +++ b/data/templates/blank2d/src/trident/MainPanel.java @@ -102,6 +102,7 @@ public class MainPanel extends JPanel { if(key == KeyEvent.VK_F11){ Trident.fullscreen = !Trident.fullscreen; Main.window = BTools.getWindowFullscreen(Main.window, Trident.fullscreen, panel); + Update.tridentEvent(Trident.EVENT_FULLSCREEN); return; } if(!inIntro){ diff --git a/data/templates/blank2d/src/trident/Trident.java b/data/templates/blank2d/src/trident/Trident.java index 695f873..ab3bef8 100644 --- a/data/templates/blank2d/src/trident/Trident.java +++ b/data/templates/blank2d/src/trident/Trident.java @@ -54,7 +54,7 @@ public class Trident { protected static String newSprite = null; // Trident events - public static final int EVENT_SCREENSHOT = 0; + public static final int EVENT_SCREENSHOT = 0, EVENT_FULLSCREEN = 1; // Setting methods diff --git a/data/templates/blank3d/src/trident/Main.java b/data/templates/blank3d/src/trident/Main.java index 922dde7..68cd638 100644 --- a/data/templates/blank3d/src/trident/Main.java +++ b/data/templates/blank3d/src/trident/Main.java @@ -3,7 +3,7 @@ package trident; import javax.swing.*; import java.awt.*; public class Main{ - protected static JFrame window = new JFrame("3D Trident Project"); + public static JFrame window = new JFrame("3D Trident Project"); public static void main(String[] args){ window.setSize(700, 500); window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); diff --git a/data/templates/blank3d/src/trident/MainPanel.java b/data/templates/blank3d/src/trident/MainPanel.java index 20afddf..fecbecb 100644 --- a/data/templates/blank3d/src/trident/MainPanel.java +++ b/data/templates/blank3d/src/trident/MainPanel.java @@ -14,7 +14,7 @@ public class MainPanel extends JPanel { protected FrameManager frameManager = new FrameManager(); public static Server server; - protected KeyManager km = new InputListener(this); + public KeyManager km = new InputListener(this); private Animator introAnim; public static Position introPos = new Position(); public static ImageIcon splash = new ImageIcon("data/images/trident/splash.png"); @@ -23,6 +23,8 @@ public class MainPanel extends JPanel { public MainPanel(){ + Trident.panel = this; + System.setProperty("sun.java2d.opengl", "true"); // hardware acceleration? setBackground(Color.black); @@ -102,6 +104,7 @@ public class MainPanel extends JPanel { if(key == KeyEvent.VK_F11){ Trident.fullscreen = !Trident.fullscreen; Main.window = BTools.getWindowFullscreen(Main.window, Trident.fullscreen, panel); + Update.tridentEvent(Trident.EVENT_FULLSCREEN); return; } if(!inIntro){ diff --git a/data/templates/blank3d/src/trident/Trident.java b/data/templates/blank3d/src/trident/Trident.java index 2096c6f..0bf9e14 100644 --- a/data/templates/blank3d/src/trident/Trident.java +++ b/data/templates/blank3d/src/trident/Trident.java @@ -36,6 +36,8 @@ public class Trident { public static boolean drawPlayer = true; public static Position mouseWorldPos = new Position(); public static boolean enableBloom = true, enableExposure = true; + public static boolean captureCursor = false; + public static MainPanel panel = null; // Trident Variables @@ -56,7 +58,7 @@ public class Trident { protected static String newSprite = null; // Trident events - public static final int EVENT_SCREENSHOT = 0; + public static final int EVENT_SCREENSHOT = 0, EVENT_FULLSCREEN = 1; // Setting methods diff --git a/data/templates/blank3d/src/update/Inputs.java b/data/templates/blank3d/src/update/Inputs.java index d84fb42..e772367 100644 --- a/data/templates/blank3d/src/update/Inputs.java +++ b/data/templates/blank3d/src/update/Inputs.java @@ -35,13 +35,16 @@ public class Inputs { } } } + if(key == KeyEvent.VK_ESCAPE){ + Trident.captureCursor = false; + } // if(key == KeyEvent.VK_DOWN) Rend3D.offset++; // if(key == KeyEvent.VK_UP) Rend3D.offset--; } } public static void mousePressed(int mb, Point mousePos, Position worldPos){ - + Trident.captureCursor = true; } public static void onScroll(int scroll){ diff --git a/data/templates/blank3d/src/update/Update.java b/data/templates/blank3d/src/update/Update.java index 60e1941..022b604 100644 --- a/data/templates/blank3d/src/update/Update.java +++ b/data/templates/blank3d/src/update/Update.java @@ -4,6 +4,7 @@ import trident.*; import trident.ent.*; import ent.*; import java.util.ArrayList; + import blib.b3d.*; import blib.game.*; import blib.util.*; @@ -79,15 +80,51 @@ public class Update { public static void update(long elapsedTime){ if(Rend3D.enabled){ + int mouseDelta = 0; + if(Trident.captureCursor){ + int startX = Trident.panel.km.getMousePos().x; + Point p = new Point(Main.window.getWidth() / 2 + Main.window.getX(), Main.window.getHeight() / 2 + Main.window.getY()); + mouseDelta = startX - Main.window.getWidth() / 2; + if(!Trident.getFullscreen()) mouseDelta += 8; + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice[] gs = ge.getScreenDevices(); + + // Search the devices for the one that draws the specified point. + for (GraphicsDevice device: gs) { + GraphicsConfiguration[] configurations = + device.getConfigurations(); + + + boolean gtfo = false; + for (GraphicsConfiguration config: configurations) { + Rectangle bounds = config.getBounds(); + if(bounds.contains(p)) { + // Set point to screen coordinates. + + try { + Robot r = new Robot(device); + r.mouseMove(p.x, p.y); + } catch (AWTException e) { + e.printStackTrace(); + } + + gtfo = true; + break; + } + } + + if(gtfo) break; + } + + Trident.panel.setCursor(BTools.getBlankCursor()); + }else{ + Trident.panel.setCursor(Cursor.getDefaultCursor()); + } Trident.setPlrSpeed(0); if(HUD.currentDialog == null){ // only move when there's no dialog - if(Trident.getKeyDown(KeyEvent.VK_LEFT)){ - WallManager.camera.direction -= Math.toRadians(0.1) * elapsedTime; - } - if(Trident.getKeyDown(KeyEvent.VK_RIGHT)){ - WallManager.camera.direction += Math.toRadians(0.1) * elapsedTime; - } + + if(Trident.captureCursor) WallManager.camera.direction += Math.toRadians(mouseDelta * 0.007) * elapsedTime; Position startPos = Trident.getPlrPos().copy(); Point move = new Point();