-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Tweaks for HDDBSCAN support * 3D Orbit support for Manifold3D objects * Manifold 3D export support. * fix copyright * vendor com.clust4j * No need for extraModuleInfo for commons-lang3 * fmt * fmt clust4j * clust4j junit4 -> junit5 migration * small version adjustments * ci adjustment * fmt * Fixed Pom to longer use license header plugin. * HitShape3D destructible. Splitting logic functional based on convex centroid. * PlayerShip can now rotate and fire independently from Camera transform. Fireball has distance based Time to Live. * HitEventHandler now flashes points scored on hits. * Fixed Skybox to use simple space textures. New VidePane player with intro logic for projectilesystem. * Added Thrust and flipCheck support for player * FireBalls emitted from player now use player location as starting point. Max thrust limiter logic added. * WIP Alien ship can now be added to projectile system. Animates with velocity but does not yet fire or collide with asteroids. Endlessly flips at the moment, need to remove after flip like in original game. * Empty Vision (mtyV) now broadcasting * Aliens now fire stuff! * Tracer Rounds implemented. WIP MaterialModel * Joystick controls connected to projectile system. * Fixed Joystick layout to include Fire and Thrust Buttons. Cleaned up visibility issues with ProjectionPane and ProjectileSystem mode. * Fixed hittable flip check logic. Updated ViewControlsMenu with back to work option. * remove unrelated changes * chore: fmt --------- Co-authored-by: samypr100 <[email protected]>
- Loading branch information
Showing
292 changed files
with
56,887 additions
and
137 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <actions> | ||
| <action> | ||
| <actionName>run</actionName> | ||
| <packagings> | ||
| <packaging>jar</packaging> | ||
| </packagings> | ||
| <goals> | ||
| <goal>clean</goal> | ||
| <goal>javafx:run</goal> | ||
| </goals> | ||
| <properties> | ||
| <exec.executable>java</exec.executable> | ||
| <exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs> | ||
| <exec.args>${exec.vmArgs}</exec.args> | ||
| <exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass> | ||
| </properties> | ||
| </action> | ||
| <action> | ||
| <actionName>debug</actionName> | ||
| <packagings> | ||
| <packaging>jar</packaging> | ||
| </packagings> | ||
| <goals> | ||
| <goal>clean</goal> | ||
| <goal>javafx:run@debug</goal> | ||
| </goals> | ||
| <properties> | ||
| <skipTests>true</skipTests> | ||
| <exec.executable>java</exec.executable> | ||
| <jpda.listen>true</jpda.listen> | ||
| <jpda.address>8000</jpda.address> | ||
| <exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs> | ||
| <exec.args>${exec.vmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=8000 -classpath %classpath edu.jhuapl.trinity.App</exec.args> | ||
| </properties> | ||
| </action> | ||
| </actions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /******************************************************************************* | ||
| * Copyright 2015, 2016 Taylor G Smith | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| *******************************************************************************/ | ||
| package com.clust4j; | ||
|
|
||
| import java.io.FileInputStream; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.ObjectInputStream; | ||
| import java.io.ObjectOutputStream; | ||
|
|
||
| /** | ||
| * The absolute super type for all clust4j objects (models and datasets) | ||
| * that should be able to commonly serialize their data. | ||
| * | ||
| * @author Taylor G Smith | ||
| */ | ||
| public abstract class Clust4j implements java.io.Serializable { | ||
| private static final long serialVersionUID = -4522135376738501625L; | ||
|
|
||
| /** | ||
| * Load a model from a FileInputStream | ||
| * | ||
| * @param fos | ||
| * @return | ||
| * @throws IOException | ||
| * @throws ClassNotFoundException | ||
| */ | ||
| public static Clust4j loadObject(final FileInputStream fis) throws IOException, ClassNotFoundException { | ||
| ObjectInputStream in = null; | ||
| Clust4j bm = null; | ||
|
|
||
| try { | ||
| in = new ObjectInputStream(fis); | ||
| bm = (Clust4j) in.readObject(); | ||
| } finally { | ||
| if (null != in) | ||
| in.close(); | ||
|
|
||
| fis.close(); | ||
| } | ||
|
|
||
| return bm; | ||
| } | ||
|
|
||
| /** | ||
| * Save a model to FileOutputStream | ||
| * | ||
| * @param fos | ||
| * @throws IOException | ||
| */ | ||
| public void saveObject(final FileOutputStream fos) throws IOException { | ||
| ObjectOutputStream out = null; | ||
|
|
||
| try { | ||
| out = new ObjectOutputStream(fos); | ||
| out.writeObject(this); | ||
| } finally { | ||
| if (null != out) | ||
| out.close(); | ||
|
|
||
| fos.close(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.