[DEV] continue rewwork
This commit is contained in:
parent
d8983205f0
commit
a92a139875
@ -22,7 +22,7 @@
|
|||||||
<attribute name="test" value="true"/>
|
<attribute name="test" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/scenarium-logger">
|
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-gale">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="module" value="true"/>
|
<attribute name="module" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
@ -32,12 +32,12 @@
|
|||||||
<attribute name="module" value="true"/>
|
<attribute name="module" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-gale">
|
<classpathentry combineaccessrules="false" kind="src" path="/scenarium-logger">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="module" value="true"/>
|
<attribute name="module" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry combineaccessrules="false" kind="src" path="/jReactPhysics3D">
|
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-ephysics">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="module" value="true"/>
|
<attribute name="module" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Atria-soft gameengine
|
Atria-soft ege
|
||||||
==============
|
==============
|
||||||
|
|
||||||
[MPL-2] Mozilla public licence (V 2.0)
|
[MPL-2] Mozilla public licence (V 2.0)
|
||||||
|
21
hs_err_pid5076.log
Normal file
21
hs_err_pid5076.log
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
#
|
||||||
|
# A fatal error has been detected by the Java Runtime Environment:
|
||||||
|
#
|
||||||
|
# SIGSEGV (0xb) at pc=0x00007f6a900e9101, pid=5076, tid=5118
|
||||||
|
#
|
||||||
|
# JRE version: OpenJDK Runtime Environment (14.0.2+13) (build 14.0.2+13)
|
||||||
|
# Java VM: OpenJDK 64-Bit Server VM (14.0.2+13, mixed mode, sharing, tiered, compressed oops, g1 gc, linux-amd64)
|
||||||
|
# Problematic frame:
|
||||||
|
# C [libjimage.so+0x4101] ImageStrings::find(Endian*, char const*, int*, unsigned int)+0x71
|
||||||
|
#
|
||||||
|
# Core dump will be written. Default location: Core dumps may be processed with "/usr/lib/systemd/systemd-coredump %P %u %g %s %t %c %h" (or dumping to /home/heero/dev/workspace-game2/atriasoft/ege/core.5076)
|
||||||
|
#
|
||||||
|
# If you would like to submit a bug report, please visit:
|
||||||
|
# https://bugreport.java.com/bugreport/crash.jsp
|
||||||
|
#
|
||||||
|
|
||||||
|
--------------- S U M M A R Y ------------
|
||||||
|
|
||||||
|
Command Line: -XX:+ShowCodeDetailsInExceptionMessages -agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:39203 -javaagent:/home/heero/.local/application/eclipse.app/eclipse/configuration/org.eclipse.osgi/1064/0/.cp/lib/javaagent-shaded.jar -Dfile.encoding=UTF-8 --module-path=/home/heero/dev/workspace-game2/atriasoft/ege/out/eclipse/classes:/home/heero/dev/workspace-game2/scenarium/logger/out/eclipse/classes:/home/heero/dev/workspace-game2/atriasoft/etk/out/eclipse/classes:/home/heero/dev/workspace-game2/atriasoft/gale/out/eclipse/classes:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl3-awt-0.1.7.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/pngdecoder.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-assimp.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-assimp-natives-linux.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-glfw.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-glfw-natives-linux.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-jawt.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-natives-linux.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-opengl.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-stb.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-stb-natives-linux.jar:/home/heero/dev/workspace-game2/atriasoft/gale/lib/lwjgl/lwjgl-opengl-natives-linux.jar:/home/heero/dev/workspace-game2/jReactPhysics3D/out/eclipse/classes -Djdk.module.main=org.atriasoft.gameengine org.atriasoft.gameengine/org.atriasoft.gameengine.samples.LoxelEngine.MainLoxelEngine
|
||||||
|
|
||||||
|
Host:
|
@ -1,5 +1,5 @@
|
|||||||
package engineTester;
|
package engineTester;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.lwjgl.*;
|
import org.lwjgl.*;
|
||||||
import org.lwjgl.glfw.*;
|
import org.lwjgl.glfw.*;
|
||||||
import org.lwjgl.opengl.*;
|
import org.lwjgl.opengl.*;
|
||||||
|
@ -2,15 +2,15 @@
|
|||||||
*
|
*
|
||||||
* @author Edouard DUPIN */
|
* @author Edouard DUPIN */
|
||||||
|
|
||||||
open module org.atriasoft.gameengine {
|
open module org.atriasoft.ege {
|
||||||
exports org.atriasoft.gameengine;
|
exports org.atriasoft.ege;
|
||||||
exports org.atriasoft.gameengine.camera;
|
exports org.atriasoft.ege.camera;
|
||||||
exports org.atriasoft.gameengine.components;
|
exports org.atriasoft.ege.components;
|
||||||
exports org.atriasoft.gameengine.engines;
|
exports org.atriasoft.ege.engines;
|
||||||
exports org.atriasoft.gameengine.geometry;
|
exports org.atriasoft.ege.geometry;
|
||||||
exports org.atriasoft.gameengine.map;
|
exports org.atriasoft.ege.map;
|
||||||
exports org.atriasoft.gameengine.physics.shape;
|
exports org.atriasoft.ege.physics.shape;
|
||||||
exports org.atriasoft.gameengine.resource;
|
exports org.atriasoft.ege.resource;
|
||||||
|
|
||||||
requires transitive org.atriasoft.gale;
|
requires transitive org.atriasoft.gale;
|
||||||
requires transitive org.atriasoft.etk;
|
requires transitive org.atriasoft.etk;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
public abstract class Component {
|
public abstract class Component {
|
||||||
public abstract String getType();
|
public abstract String getType();
|
@ -1,19 +1,19 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
import org.atriasoft.ewol.event.EventEntry;
|
||||||
import org.atriasoft.gale.Gale;
|
import org.atriasoft.gale.Gale;
|
||||||
import org.atriasoft.gale.event.EventEntry;
|
|
||||||
import org.atriasoft.gale.event.EventInput;
|
import org.atriasoft.gale.event.EventInput;
|
||||||
import org.atriasoft.gale.event.EventTime;
|
import org.atriasoft.gale.event.EventTime;
|
||||||
import org.atriasoft.gale.key.KeyKeyboard;
|
import org.atriasoft.gale.key.KeyKeyboard;
|
||||||
import org.atriasoft.gale.key.KeyStatus;
|
import org.atriasoft.gale.key.KeyStatus;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentPhysics;
|
import org.atriasoft.ege.components.ComponentPhysics;
|
||||||
import org.atriasoft.gameengine.components.ComponentPlayer;
|
import org.atriasoft.ege.components.ComponentPlayer;
|
||||||
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
|
import org.atriasoft.ege.components.ComponentPositionPlayer;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
|
|
||||||
public class ControlCameraPlayer implements ControlInterface {
|
public class ControlCameraPlayer implements ControlInterface {
|
||||||
private final Camera camera;
|
private final Camera camera;
|
@ -1,18 +1,18 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
import org.atriasoft.ewol.event.EventEntry;
|
||||||
import org.atriasoft.gale.Gale;
|
import org.atriasoft.gale.Gale;
|
||||||
import org.atriasoft.gale.event.EventEntry;
|
|
||||||
import org.atriasoft.gale.event.EventInput;
|
import org.atriasoft.gale.event.EventInput;
|
||||||
import org.atriasoft.gale.event.EventTime;
|
import org.atriasoft.gale.event.EventTime;
|
||||||
import org.atriasoft.gale.key.KeyKeyboard;
|
import org.atriasoft.gale.key.KeyKeyboard;
|
||||||
import org.atriasoft.gale.key.KeyStatus;
|
import org.atriasoft.gale.key.KeyStatus;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentPlayer;
|
import org.atriasoft.ege.components.ComponentPlayer;
|
||||||
import org.atriasoft.gameengine.components.ComponentPosition;
|
import org.atriasoft.ege.components.ComponentPosition;
|
||||||
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
|
import org.atriasoft.ege.components.ComponentPositionPlayer;
|
||||||
|
|
||||||
import renderEngine.DisplayManager;
|
import renderEngine.DisplayManager;
|
||||||
|
|
@ -1,13 +1,13 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
import org.atriasoft.gale.event.EventEntry;
|
import org.atriasoft.ewol.event.EventEntry;
|
||||||
import org.atriasoft.gale.event.EventInput;
|
import org.atriasoft.gale.event.EventInput;
|
||||||
import org.atriasoft.gale.event.EventTime;
|
import org.atriasoft.gale.event.EventTime;
|
||||||
import org.atriasoft.gale.key.KeyKeyboard;
|
import org.atriasoft.gale.key.KeyKeyboard;
|
||||||
import org.atriasoft.gale.key.KeyStatus;
|
import org.atriasoft.gale.key.KeyStatus;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
|
|
||||||
|
|
||||||
public class ControlCameraSimple implements ControlInterface {
|
public class ControlCameraSimple implements ControlInterface {
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
import org.atriasoft.gale.event.EventEntry;
|
import org.atriasoft.ewol.event.EventEntry;
|
||||||
import org.atriasoft.gale.event.EventInput;
|
import org.atriasoft.gale.event.EventInput;
|
||||||
import org.atriasoft.gale.event.EventTime;
|
import org.atriasoft.gale.event.EventTime;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
public interface CreatorEntity {
|
public interface CreatorEntity {
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
|
|
||||||
public abstract class Engine {
|
public abstract class Engine {
|
||||||
protected Environement env;
|
protected Environement env;
|
@ -1,10 +1,10 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
|
|
||||||
public class Entity {
|
public class Entity {
|
||||||
private static int uIDGlobal = 0; //!< This is a reference on a basic Entity ID
|
private static int uIDGlobal = 0; //!< This is a reference on a basic Entity ID
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -6,25 +6,25 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
|
import org.atriasoft.ewol.event.EventEntry;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.event.EventEntry;
|
|
||||||
import org.atriasoft.gale.event.EventInput;
|
import org.atriasoft.gale.event.EventInput;
|
||||||
import org.atriasoft.gale.event.EventTime;
|
import org.atriasoft.gale.event.EventTime;
|
||||||
import org.atriasoft.gale.key.KeyKeyboard;
|
import org.atriasoft.gale.key.KeyKeyboard;
|
||||||
import org.atriasoft.gale.key.KeySpecial;
|
import org.atriasoft.gale.key.KeySpecial;
|
||||||
import org.atriasoft.gale.key.KeyStatus;
|
import org.atriasoft.gale.key.KeyStatus;
|
||||||
import org.atriasoft.gale.key.KeyType;
|
import org.atriasoft.gale.key.KeyType;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.engines.EngineAI;
|
import org.atriasoft.ege.engines.EngineAI;
|
||||||
import org.atriasoft.gameengine.engines.EngineDynamicMeshs;
|
import org.atriasoft.ege.engines.EngineDynamicMeshs;
|
||||||
import org.atriasoft.gameengine.engines.EngineGravity;
|
import org.atriasoft.ege.engines.EngineGravity;
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.engines.EngineParticle;
|
import org.atriasoft.ege.engines.EngineParticle;
|
||||||
import org.atriasoft.gameengine.engines.EnginePhysics;
|
import org.atriasoft.ege.engines.EnginePhysics;
|
||||||
import org.atriasoft.gameengine.engines.EnginePlayer;
|
import org.atriasoft.ege.engines.EnginePlayer;
|
||||||
import org.atriasoft.gameengine.engines.EngineRender;
|
import org.atriasoft.ege.engines.EngineRender;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
//import org.atriasoft.gameengine.resource.Mesh;
|
//import org.atriasoft.ege.resource.Mesh;
|
||||||
|
|
||||||
public class Environement {
|
public class Environement {
|
||||||
private static Map<String, CreatorEntity> creators = new HashMap<String, CreatorEntity>();
|
private static Map<String, CreatorEntity> creators = new HashMap<String, CreatorEntity>();
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
public enum GameStatus {
|
public enum GameStatus {
|
||||||
gameStart,
|
gameStart,
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
public class ResultNearestEntity {
|
public class ResultNearestEntity {
|
||||||
public Entity entity;
|
public Entity entity;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine;
|
package org.atriasoft.ege;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.camera;
|
package org.atriasoft.ege.camera;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.engines.EngineAI;
|
import org.atriasoft.ege.engines.EngineAI;
|
||||||
|
|
||||||
public abstract class ComponentAI extends Component {
|
public abstract class ComponentAI extends Component {
|
||||||
|
|
@ -1,14 +1,14 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.engines.EngineDynamicMeshs;
|
||||||
import org.atriasoft.gameengine.engines.EngineDynamicMeshs;
|
import org.atriasoft.ege.resource.ResourceStaticMesh;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
|
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
|
|
||||||
|
|
||||||
public class ComponentDynamicMeshs extends Component {
|
public class ComponentDynamicMeshs extends Component {
|
||||||
protected Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();
|
protected Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();
|
@ -1,8 +1,8 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
|
|
||||||
public abstract class ComponentGravity extends Component {
|
public abstract class ComponentGravity extends Component {
|
||||||
public ComponentGravity() {
|
public ComponentGravity() {
|
@ -1,8 +1,8 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
|
|
||||||
public class ComponentGravityStatic extends ComponentGravity {
|
public class ComponentGravityStatic extends ComponentGravity {
|
||||||
private Vector3f gravity;
|
private Vector3f gravity;
|
@ -1,8 +1,8 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
|
|
||||||
public class ComponentLight extends Component {
|
public class ComponentLight extends Component {
|
||||||
// the material is not a resource, it can change in time... with AI or selection...
|
// the material is not a resource, it can change in time... with AI or selection...
|
@ -1,6 +1,6 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Light;
|
import org.atriasoft.ege.Light;
|
||||||
|
|
||||||
public class ComponentLightSun extends ComponentLight{
|
public class ComponentLightSun extends ComponentLight{
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.engines.EngineMap;
|
import org.atriasoft.ege.engines.EngineMap;
|
||||||
|
|
||||||
public class ComponentMap extends Component {
|
public class ComponentMap extends Component {
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Material;
|
import org.atriasoft.ege.Material;
|
||||||
|
|
||||||
public class ComponentMaterial extends Component {
|
public class ComponentMaterial extends Component {
|
||||||
// the material is not a resource, it can change in time... with AI or selection...
|
// the material is not a resource, it can change in time... with AI or selection...
|
@ -1,10 +1,10 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Material;
|
import org.atriasoft.ege.Material;
|
||||||
|
|
||||||
public class ComponentMaterials extends Component {
|
public class ComponentMaterials extends Component {
|
||||||
// the material is not a resource, it can change in time... with AI or selection...
|
// the material is not a resource, it can change in time... with AI or selection...
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.engines.EngineParticle;
|
import org.atriasoft.ege.engines.EngineParticle;
|
||||||
|
|
||||||
public class ComponentParticle extends Component {
|
public class ComponentParticle extends Component {
|
||||||
|
|
@ -1,8 +1,11 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
|
import org.atriasoft.ege.Signal;
|
||||||
import org.atriasoft.ephysics.body.BodyType;
|
import org.atriasoft.ephysics.body.BodyType;
|
||||||
import org.atriasoft.ephysics.body.RigidBody;
|
import org.atriasoft.ephysics.body.RigidBody;
|
||||||
import org.atriasoft.ephysics.collision.ProxyShape;
|
import org.atriasoft.ephysics.collision.ProxyShape;
|
||||||
@ -23,20 +26,17 @@ import org.atriasoft.etk.math.Quaternion;
|
|||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.engines.EnginePhysics;
|
||||||
import org.atriasoft.gameengine.Signal;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.physics.shape.Box;
|
||||||
import org.atriasoft.gameengine.engines.EnginePhysics;
|
import org.atriasoft.ege.physics.shape.Capsule;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.physics.shape.Concave;
|
||||||
import org.atriasoft.gameengine.physics.shape.Box;
|
import org.atriasoft.ege.physics.shape.Cone;
|
||||||
import org.atriasoft.gameengine.physics.shape.Capsule;
|
import org.atriasoft.ege.physics.shape.ConvexHull;
|
||||||
import org.atriasoft.gameengine.physics.shape.Concave;
|
import org.atriasoft.ege.physics.shape.Cylinder;
|
||||||
import org.atriasoft.gameengine.physics.shape.Cone;
|
import org.atriasoft.ege.physics.shape.Shape;
|
||||||
import org.atriasoft.gameengine.physics.shape.ConvexHull;
|
import org.atriasoft.ege.physics.shape.Sphere;
|
||||||
import org.atriasoft.gameengine.physics.shape.Cylinder;
|
|
||||||
import org.atriasoft.gameengine.physics.shape.Shape;
|
|
||||||
import org.atriasoft.gameengine.physics.shape.Sphere;
|
|
||||||
|
|
||||||
public class ComponentPhysics extends Component {
|
public class ComponentPhysics extends Component {
|
||||||
public Signal<Transform3D> signalPosition = new Signal<>();;
|
public Signal<Transform3D> signalPosition = new Signal<>();;
|
||||||
@ -63,8 +63,11 @@ public class ComponentPhysics extends Component {
|
|||||||
this.rigidBody.setUserData(this);
|
this.rigidBody.setUserData(this);
|
||||||
// set collision callback:
|
// set collision callback:
|
||||||
//this.engine.getDynamicWorld().testCollision(this.rigidBody, this);
|
//this.engine.getDynamicWorld().testCollision(this.rigidBody, this);
|
||||||
|
this.rigidBody.getMaterial().setBounciness(0.0f);
|
||||||
this.rigidBody.setAngularDamping(0.9f);
|
this.rigidBody.setAngularDamping(0.9f);
|
||||||
this.rigidBody.setLinearDamping(0.9f);
|
this.rigidBody.setLinearDamping(0.9f);
|
||||||
|
//this.rigidBody.getMaterial().setFrictionCoefficient(0.01f);
|
||||||
|
//this.rigidBody.getMaterial().setRollingResistance(0.01f);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -84,7 +87,7 @@ public class ComponentPhysics extends Component {
|
|||||||
Log.error("RollingResistance=" + this.rigidBody.getMaterial().getRollingResistance());
|
Log.error("RollingResistance=" + this.rigidBody.getMaterial().getRollingResistance());
|
||||||
Log.error("LinearDamping=" + this.rigidBody.getLinearDamping());
|
Log.error("LinearDamping=" + this.rigidBody.getLinearDamping());
|
||||||
Log.error("AngularDamping=" + this.rigidBody.getAngularDamping());
|
Log.error("AngularDamping=" + this.rigidBody.getAngularDamping());
|
||||||
this.rigidBody.getMaterial().setBounciness(0.4f);
|
this.rigidBody.getMaterial().setBounciness(0.0f);
|
||||||
//this.rigidBody.getMaterial().setFrictionCoefficient(0.01f);
|
//this.rigidBody.getMaterial().setFrictionCoefficient(0.01f);
|
||||||
//this.rigidBody.getMaterial().setRollingResistance(0.01f);
|
//this.rigidBody.getMaterial().setRollingResistance(0.01f);
|
||||||
this.rigidBody.setAngularDamping(0.9f);
|
this.rigidBody.setAngularDamping(0.9f);
|
||||||
@ -492,6 +495,10 @@ public class ComponentPhysics extends Component {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setAngularReactionEnable(final boolean value) {
|
||||||
|
this.rigidBody.setAngularReactionEnable(value);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Set the angular velocity (whole world).
|
* @brief Set the angular velocity (whole world).
|
||||||
* @param[in] _linearVelocity The angular velocity vector of the body
|
* @param[in] _linearVelocity The angular velocity vector of the body
|
||||||
@ -559,6 +566,10 @@ public class ComponentPhysics extends Component {
|
|||||||
this.shape = _prop;
|
this.shape = _prop;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setSleepingEnable(final boolean value) {
|
||||||
|
this.rigidBody.setIsAllowedToSleep(value);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief set a new transformation
|
* @brief set a new transformation
|
||||||
* @param[in] _transform transformation of the position
|
* @param[in] _transform transformation of the position
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.engines.EnginePlayer;
|
import org.atriasoft.ege.engines.EnginePlayer;
|
||||||
|
|
||||||
public class ComponentPlayer extends Component {
|
public class ComponentPlayer extends Component {
|
||||||
private float runSpeed = 35;
|
private float runSpeed = 35;
|
@ -1,9 +1,9 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Signal;
|
||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Signal;
|
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
|
||||||
|
|
||||||
public class ComponentPosition extends Component {
|
public class ComponentPosition extends Component {
|
||||||
public Signal<Transform3D> signalPosition;
|
public Signal<Transform3D> signalPosition;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.engines.EngineRender;
|
import org.atriasoft.ege.engines.EngineRender;
|
||||||
|
|
||||||
public abstract class ComponentRender extends Component {
|
public abstract class ComponentRender extends Component {
|
||||||
private boolean propertyDebugNormal = false;
|
private boolean propertyDebugNormal = false;
|
@ -1,12 +1,12 @@
|
|||||||
|
|
||||||
|
|
||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.resource.ResourceProgram;
|
import org.atriasoft.gale.resource.ResourceProgram;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
|
|
||||||
public class ComponentRenderColoredStaticMesh extends ComponentRender {
|
public class ComponentRenderColoredStaticMesh extends ComponentRender {
|
||||||
ComponentStaticMesh mesh = null;
|
ComponentStaticMesh mesh = null;
|
@ -1,17 +1,17 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.resource.ResourceProgram;
|
import org.atriasoft.gale.resource.ResourceProgram;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
import org.atriasoft.gameengine.Material;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
|
||||||
|
|
||||||
public class ComponentRenderTexturedMaterialsDynamicMeshs extends ComponentRender {
|
public class ComponentRenderTexturedMaterialsDynamicMeshs extends ComponentRender {
|
||||||
private static final int numberOfLight = 8;
|
private static final int numberOfLight = 8;
|
@ -1,14 +1,14 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.resource.ResourceProgram;
|
import org.atriasoft.gale.resource.ResourceProgram;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
import org.atriasoft.gameengine.Material;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
|
||||||
|
|
||||||
public class ComponentRenderTexturedMaterialsStaticMesh extends ComponentRender {
|
public class ComponentRenderTexturedMaterialsStaticMesh extends ComponentRender {
|
||||||
private static final int numberOfLight = 8;
|
private static final int numberOfLight = 8;
|
@ -1,16 +1,16 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.resource.ResourceProgram;
|
import org.atriasoft.gale.resource.ResourceProgram;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.Light;
|
|
||||||
import org.atriasoft.gameengine.Material;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
|
||||||
|
|
||||||
public class ComponentRenderTexturedMaterialsStaticMeshs extends ComponentRender {
|
public class ComponentRenderTexturedMaterialsStaticMeshs extends ComponentRender {
|
||||||
private static final int numberOfLight = 8;
|
private static final int numberOfLight = 8;
|
@ -1,10 +1,10 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL;
|
import org.atriasoft.gale.backend3d.OpenGL;
|
||||||
import org.atriasoft.gale.resource.ResourceProgram;
|
import org.atriasoft.gale.resource.ResourceProgram;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
|
|
||||||
public class ComponentRenderTexturedStaticMesh extends ComponentRender {
|
public class ComponentRenderTexturedStaticMesh extends ComponentRender {
|
||||||
ComponentStaticMesh mesh = null;
|
ComponentStaticMesh mesh = null;
|
@ -1,9 +1,9 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.resource.ResourceStaticMesh;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
|
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
|
|
||||||
|
|
||||||
public class ComponentStaticMesh extends Component {
|
public class ComponentStaticMesh extends Component {
|
||||||
private ResourceStaticMesh mesh = null;
|
private ResourceStaticMesh mesh = null;
|
@ -1,14 +1,14 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.resource.ResourceStaticMesh;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
|
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
|
||||||
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
|
|
||||||
|
|
||||||
public class ComponentStaticMeshs extends Component {
|
public class ComponentStaticMeshs extends Component {
|
||||||
private Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();
|
private Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();
|
@ -1,9 +1,9 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gale.resource.ResourceTexture;
|
import org.atriasoft.gale.resource.ResourceTexture;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
|
|
||||||
public class ComponentTexture extends Component {
|
public class ComponentTexture extends Component {
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
|
|
||||||
public class ComponentTexturePack extends Component {
|
public class ComponentTexturePack extends Component {
|
||||||
|
|
@ -1,13 +1,13 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gale.resource.ResourceTexture;
|
import org.atriasoft.gale.resource.ResourceTexture;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Component;
|
|
||||||
import org.atriasoft.gameengine.Material;
|
|
||||||
|
|
||||||
public class ComponentTextures extends Component {
|
public class ComponentTextures extends Component {
|
||||||
private Map<String, ResourceTexture> textures = new HashMap<String, ResourceTexture>();
|
private Map<String, ResourceTexture> textures = new HashMap<String, ResourceTexture>();
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
public class GlLightIndex {
|
public class GlLightIndex {
|
||||||
int oGLcolor;
|
int oGLcolor;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.components;
|
package org.atriasoft.ege.components;
|
||||||
|
|
||||||
public enum PhysicBodyType {
|
public enum PhysicBodyType {
|
||||||
BODY_DYNAMIC,
|
BODY_DYNAMIC,
|
@ -1,13 +1,13 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentAI;
|
import org.atriasoft.ege.components.ComponentAI;
|
||||||
|
|
||||||
public class EngineAI extends Engine {
|
public class EngineAI extends Engine {
|
||||||
public static final String ENGINE_NAME = "ia";
|
public static final String ENGINE_NAME = "ia";
|
@ -1,12 +1,12 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentDynamicMeshs;
|
import org.atriasoft.ege.components.ComponentDynamicMeshs;
|
||||||
|
|
||||||
public class EngineDynamicMeshs extends Engine {
|
public class EngineDynamicMeshs extends Engine {
|
||||||
public static final String ENGINE_NAME = "dynamic-meshs";
|
public static final String ENGINE_NAME = "dynamic-meshs";
|
@ -1,18 +1,18 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Engine;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.components.ComponentAI;
|
||||||
import org.atriasoft.gameengine.Light;
|
import org.atriasoft.ege.components.ComponentGravity;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.components.ComponentLight;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.components.ComponentLightSun;
|
||||||
import org.atriasoft.gameengine.components.ComponentAI;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentGravity;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentLight;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentLightSun;
|
|
||||||
|
|
||||||
public class EngineGravity extends Engine {
|
public class EngineGravity extends Engine {
|
||||||
public static final String ENGINE_NAME = "gravity";
|
public static final String ENGINE_NAME = "gravity";
|
@ -1,17 +1,17 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Engine;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.components.ComponentAI;
|
||||||
import org.atriasoft.gameengine.Light;
|
import org.atriasoft.ege.components.ComponentLight;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.components.ComponentLightSun;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentAI;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentLight;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentLightSun;
|
|
||||||
|
|
||||||
public class EngineLight extends Engine {
|
public class EngineLight extends Engine {
|
||||||
public static final String ENGINE_NAME = "light";
|
public static final String ENGINE_NAME = "light";
|
@ -1,12 +1,12 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentMap;
|
import org.atriasoft.ege.components.ComponentMap;
|
||||||
|
|
||||||
public class EngineMap extends Engine {
|
public class EngineMap extends Engine {
|
||||||
public static final String ENGINE_NAME = "map";
|
public static final String ENGINE_NAME = "map";
|
@ -1,9 +1,9 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
|
|
||||||
public class EngineParticle extends Engine {
|
public class EngineParticle extends Engine {
|
||||||
public static final String ENGINE_NAME = "particle";
|
public static final String ENGINE_NAME = "particle";
|
@ -1,8 +1,11 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Component;
|
||||||
|
import org.atriasoft.ege.Engine;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.ephysics.body.RigidBody;
|
import org.atriasoft.ephysics.body.RigidBody;
|
||||||
import org.atriasoft.ephysics.collision.ContactManifold;
|
import org.atriasoft.ephysics.collision.ContactManifold;
|
||||||
import org.atriasoft.ephysics.collision.shapes.AABB;
|
import org.atriasoft.ephysics.collision.shapes.AABB;
|
||||||
@ -15,17 +18,14 @@ import org.atriasoft.etk.Color;
|
|||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.components.ComponentPhysics;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentPhysics;
|
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
|
||||||
|
|
||||||
public class EnginePhysics extends Engine implements EventListener {
|
public class EnginePhysics extends Engine implements EventListener {
|
||||||
public static final String ENGINE_NAME = "physics";
|
public static final String ENGINE_NAME = "physics";
|
||||||
// Constant physics time step
|
// Constant physics time step
|
||||||
private static final float TIME_STEP = 1.0f / 60.0f;
|
private static final float TIME_STEP = 0.016f;//1.0f / 60.0f;
|
||||||
boolean propertyDebugAABB = false;
|
boolean propertyDebugAABB = false;
|
||||||
boolean propertyDebugShape = false;
|
boolean propertyDebugShape = false;
|
||||||
// Start engine with no gravity
|
// Start engine with no gravity
|
||||||
@ -176,7 +176,7 @@ public class EnginePhysics extends Engine implements EventListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final List<ContactManifold> listContact = this.dynamicsWorld.getContactsList();
|
final List<ContactManifold> listContact = this.dynamicsWorld.getContactsList();
|
||||||
Log.info("nb contact: " + listContact.size());
|
//Log.info("nb contact: " + listContact.size());
|
||||||
for (final ContactManifold it : listContact) {
|
for (final ContactManifold it : listContact) {
|
||||||
for (int iii = 0; iii < it.getNbContactPoints(); iii++) {
|
for (int iii = 0; iii < it.getNbContactPoints(); iii++) {
|
||||||
final ContactPoint contact = it.getContactPoint(iii);
|
final ContactPoint contact = it.getContactPoint(iii);
|
||||||
@ -198,7 +198,7 @@ public class EnginePhysics extends Engine implements EventListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(long deltaMili) {
|
public void update(long deltaMili) {
|
||||||
Log.error("=================================================================" + deltaMili);
|
//Log.error("=================================================================" + deltaMili);
|
||||||
if (deltaMili > 1000) {
|
if (deltaMili > 1000) {
|
||||||
deltaMili = (long) (TIME_STEP * 1000.0f);
|
deltaMili = (long) (TIME_STEP * 1000.0f);
|
||||||
}
|
}
|
||||||
@ -207,7 +207,7 @@ public class EnginePhysics extends Engine implements EventListener {
|
|||||||
this.accumulator += deltaTime;
|
this.accumulator += deltaTime;
|
||||||
// While there is enough accumulated time to take one or several physics steps
|
// While there is enough accumulated time to take one or several physics steps
|
||||||
while (this.accumulator >= TIME_STEP) {
|
while (this.accumulator >= TIME_STEP) {
|
||||||
Log.error("---------------------------------------------------" + TIME_STEP);
|
//Log.error("---------------------------------------------------" + TIME_STEP);
|
||||||
if (this.dynamicsWorld != null) {
|
if (this.dynamicsWorld != null) {
|
||||||
// call every object to usdate their constant forces applied
|
// call every object to usdate their constant forces applied
|
||||||
for (final ComponentPhysics it : this.components) {
|
for (final ComponentPhysics it : this.components) {
|
@ -1,13 +1,13 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentPlayer;
|
import org.atriasoft.ege.components.ComponentPlayer;
|
||||||
|
|
||||||
public class EnginePlayer extends Engine {
|
public class EnginePlayer extends Engine {
|
||||||
public static final String ENGINE_NAME = "player";
|
public static final String ENGINE_NAME = "player";
|
@ -1,12 +1,12 @@
|
|||||||
package org.atriasoft.gameengine.engines;
|
package org.atriasoft.ege.engines;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.Component;
|
import org.atriasoft.ege.Component;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.Engine;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.Environement;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.components.ComponentRender;
|
import org.atriasoft.ege.components.ComponentRender;
|
||||||
|
|
||||||
public class EngineRender extends Engine {
|
public class EngineRender extends Engine {
|
||||||
public static final String ENGINE_NAME = "render";
|
public static final String ENGINE_NAME = "render";
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Matrix3f;
|
import org.atriasoft.etk.math.Matrix3f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Matrix3f;
|
import org.atriasoft.etk.math.Matrix3f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.geometry;
|
package org.atriasoft.ege.geometry;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.internal;
|
package org.atriasoft.ege.internal;
|
||||||
|
|
||||||
import io.scenarium.logger.LogLevel;
|
import io.scenarium.logger.LogLevel;
|
||||||
import io.scenarium.logger.Logger;
|
import io.scenarium.logger.Logger;
|
@ -1,12 +1,12 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2f;
|
import org.atriasoft.etk.math.Vector2f;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.etk.math.Vector3i;
|
import org.atriasoft.etk.math.Vector3i;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gameengine.components.ComponentDynamicMeshs;
|
import org.atriasoft.ege.components.ComponentDynamicMeshs;
|
||||||
import org.atriasoft.gameengine.resource.ResourceListTexturedMesh;
|
import org.atriasoft.ege.resource.ResourceListTexturedMesh;
|
||||||
|
|
||||||
public class ComponentDynamicMeshsVoxelMap extends ComponentDynamicMeshs {
|
public class ComponentDynamicMeshsVoxelMap extends ComponentDynamicMeshs {
|
||||||
private VoxelChunk chunk;
|
private VoxelChunk chunk;
|
@ -1,8 +1,8 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMeshs;
|
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMeshs;
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
|
|
||||||
public class ComponentRenderVoxelMesh extends ComponentRenderTexturedMaterialsStaticMeshs {
|
public class ComponentRenderVoxelMesh extends ComponentRenderTexturedMaterialsStaticMeshs {
|
||||||
|
|
@ -1,30 +1,30 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.Entity;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Transform3D;
|
import org.atriasoft.etk.math.Transform3D;
|
||||||
import org.atriasoft.etk.math.Vector3i;
|
import org.atriasoft.etk.math.Vector3i;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.Entity;
|
import org.atriasoft.ege.components.ComponentLight;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.components.ComponentLightSun;
|
||||||
import org.atriasoft.gameengine.Light;
|
import org.atriasoft.ege.components.ComponentMaterials;
|
||||||
import org.atriasoft.gameengine.Material;
|
import org.atriasoft.ege.components.ComponentPhysics;
|
||||||
import org.atriasoft.gameengine.components.ComponentLight;
|
import org.atriasoft.ege.components.ComponentPosition;
|
||||||
import org.atriasoft.gameengine.components.ComponentLightSun;
|
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsDynamicMeshs;
|
||||||
import org.atriasoft.gameengine.components.ComponentMaterials;
|
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMeshs;
|
||||||
import org.atriasoft.gameengine.components.ComponentPhysics;
|
import org.atriasoft.ege.components.ComponentRenderTexturedStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentPosition;
|
import org.atriasoft.ege.components.ComponentStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsDynamicMeshs;
|
import org.atriasoft.ege.components.ComponentStaticMeshs;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMeshs;
|
import org.atriasoft.ege.components.ComponentTexture;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedStaticMesh;
|
import org.atriasoft.ege.components.ComponentTextures;
|
||||||
import org.atriasoft.gameengine.components.ComponentStaticMesh;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.components.ComponentStaticMeshs;
|
import org.atriasoft.ege.engines.EngineMap;
|
||||||
import org.atriasoft.gameengine.components.ComponentTexture;
|
|
||||||
import org.atriasoft.gameengine.components.ComponentTextures;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineMap;
|
|
||||||
|
|
||||||
public class MapVoxel extends EngineMap {
|
public class MapVoxel extends EngineMap {
|
||||||
//List<VoxelChunk> listOfChunks = new ArrayList<VoxelChunk>();
|
//List<VoxelChunk> listOfChunks = new ArrayList<VoxelChunk>();
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
public class Voxel {
|
public class Voxel {
|
||||||
public int type = VoxelType.NATIVE_UNKNOWN;
|
public int type = VoxelType.NATIVE_UNKNOWN;
|
@ -1,8 +1,8 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector2i;
|
import org.atriasoft.etk.math.Vector2i;
|
||||||
import org.atriasoft.etk.math.Vector3i;
|
import org.atriasoft.etk.math.Vector3i;
|
||||||
import org.atriasoft.gameengine.components.ComponentMap;
|
import org.atriasoft.ege.components.ComponentMap;
|
||||||
|
|
||||||
// This chunk in designed in 2D no upper chunk, and no lower chunk...
|
// This chunk in designed in 2D no upper chunk, and no lower chunk...
|
||||||
public class VoxelChunk extends ComponentMap {
|
public class VoxelChunk extends ComponentMap {
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.map;
|
package org.atriasoft.ege.map;
|
||||||
|
|
||||||
public class VoxelType {
|
public class VoxelType {
|
||||||
public static final int NATIVE_UNKNOWN = 0;
|
public static final int NATIVE_UNKNOWN = 0;
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -3,13 +3,13 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
|
|
||||||
public class Concave extends Shape {
|
public class Concave extends Shape {
|
||||||
private List<Vector3f> vertexes = new ArrayList<>();
|
private List<Vector3f> vertexes = new ArrayList<>();
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Quaternion;
|
import org.atriasoft.etk.math.Quaternion;
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
@ -3,7 +3,7 @@
|
|||||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||||
* @license MPL v2.0 (see license file)
|
* @license MPL v2.0 (see license file)
|
||||||
*/
|
*/
|
||||||
package org.atriasoft.gameengine.physics.shape;
|
package org.atriasoft.ege.physics.shape;
|
||||||
|
|
||||||
import org.atriasoft.etk.math.Vector3f;
|
import org.atriasoft.etk.math.Vector3f;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.resource;
|
package org.atriasoft.ege.resource;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -9,7 +9,7 @@ import org.atriasoft.etk.math.Vector2f;
|
|||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
||||||
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
||||||
|
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
|
|
||||||
|
|
||||||
public class ResourceListTexturedMesh extends ResourceStaticMesh {
|
public class ResourceListTexturedMesh extends ResourceStaticMesh {
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.resource;
|
package org.atriasoft.ege.resource;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
||||||
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.resource;
|
package org.atriasoft.ege.resource;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.resource;
|
package org.atriasoft.ege.resource;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
||||||
import org.atriasoft.gale.resource.Resource;
|
import org.atriasoft.gale.resource.Resource;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package org.atriasoft.gameengine.resource;
|
package org.atriasoft.ege.resource;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gameengine.internal.Log;
|
import org.atriasoft.ege.internal.Log;
|
||||||
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
|
||||||
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
import org.atriasoft.gale.resource.ResourceVirtualArrayObject;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.atriasoft.gameengine.samples.LoxelEngine;
|
package org.atriasoft.ege.samples.LoxelEngine;
|
||||||
|
|
||||||
public class Log {
|
public class Log {
|
||||||
private Log() {}
|
private Log() {}
|
@ -1,8 +1,15 @@
|
|||||||
package org.atriasoft.gameengine.samples.LoxelEngine;
|
package org.atriasoft.ege.samples.LoxelEngine;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.atriasoft.ege.ControlCameraPlayer;
|
||||||
|
import org.atriasoft.ege.Engine;
|
||||||
|
import org.atriasoft.ege.Entity;
|
||||||
|
import org.atriasoft.ege.Environement;
|
||||||
|
import org.atriasoft.ege.GameStatus;
|
||||||
|
import org.atriasoft.ege.Light;
|
||||||
|
import org.atriasoft.ege.Material;
|
||||||
import org.atriasoft.etk.Color;
|
import org.atriasoft.etk.Color;
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.etk.math.Matrix4f;
|
import org.atriasoft.etk.math.Matrix4f;
|
||||||
@ -20,33 +27,26 @@ import org.atriasoft.gale.key.KeySpecial;
|
|||||||
import org.atriasoft.gale.key.KeyStatus;
|
import org.atriasoft.gale.key.KeyStatus;
|
||||||
import org.atriasoft.gale.key.KeyType;
|
import org.atriasoft.gale.key.KeyType;
|
||||||
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
import org.atriasoft.gale.resource.ResourceColored3DObject;
|
||||||
import org.atriasoft.gameengine.ControlCameraPlayer;
|
import org.atriasoft.ege.camera.Camera;
|
||||||
import org.atriasoft.gameengine.Engine;
|
import org.atriasoft.ege.components.ComponentGravityStatic;
|
||||||
import org.atriasoft.gameengine.Entity;
|
import org.atriasoft.ege.components.ComponentLight;
|
||||||
import org.atriasoft.gameengine.Environement;
|
import org.atriasoft.ege.components.ComponentLightSun;
|
||||||
import org.atriasoft.gameengine.GameStatus;
|
import org.atriasoft.ege.components.ComponentMaterial;
|
||||||
import org.atriasoft.gameengine.Light;
|
import org.atriasoft.ege.components.ComponentPhysics;
|
||||||
import org.atriasoft.gameengine.Material;
|
import org.atriasoft.ege.components.ComponentPlayer;
|
||||||
import org.atriasoft.gameengine.camera.Camera;
|
import org.atriasoft.ege.components.ComponentPosition;
|
||||||
import org.atriasoft.gameengine.components.ComponentGravityStatic;
|
import org.atriasoft.ege.components.ComponentPositionPlayer;
|
||||||
import org.atriasoft.gameengine.components.ComponentLight;
|
import org.atriasoft.ege.components.ComponentRenderColoredStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentLightSun;
|
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentMaterial;
|
import org.atriasoft.ege.components.ComponentRenderTexturedStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentPhysics;
|
import org.atriasoft.ege.components.ComponentStaticMesh;
|
||||||
import org.atriasoft.gameengine.components.ComponentPlayer;
|
import org.atriasoft.ege.components.ComponentTexture;
|
||||||
import org.atriasoft.gameengine.components.ComponentPosition;
|
import org.atriasoft.ege.components.PhysicBodyType;
|
||||||
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
|
import org.atriasoft.ege.engines.EngineLight;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderColoredStaticMesh;
|
import org.atriasoft.ege.engines.EnginePhysics;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMesh;
|
import org.atriasoft.ege.map.MapVoxel;
|
||||||
import org.atriasoft.gameengine.components.ComponentRenderTexturedStaticMesh;
|
import org.atriasoft.ege.physics.shape.Box;
|
||||||
import org.atriasoft.gameengine.components.ComponentStaticMesh;
|
import org.atriasoft.ege.tools.MeshGenerator;
|
||||||
import org.atriasoft.gameengine.components.ComponentTexture;
|
|
||||||
import org.atriasoft.gameengine.components.PhysicBodyType;
|
|
||||||
import org.atriasoft.gameengine.engines.EngineLight;
|
|
||||||
import org.atriasoft.gameengine.engines.EnginePhysics;
|
|
||||||
import org.atriasoft.gameengine.map.MapVoxel;
|
|
||||||
import org.atriasoft.gameengine.physics.shape.Box;
|
|
||||||
import org.atriasoft.gameengine.tools.MeshGenerator;
|
|
||||||
|
|
||||||
public class LoxelApplication extends Application {
|
public class LoxelApplication extends Application {
|
||||||
// public static ComponentPosition relativeTestPos;
|
// public static ComponentPosition relativeTestPos;
|
||||||
@ -126,7 +126,6 @@ public class LoxelApplication extends Application {
|
|||||||
localBox.addComponent(physics2);
|
localBox.addComponent(physics2);
|
||||||
this.env.addEntity(localBox);
|
this.env.addEntity(localBox);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
{
|
{
|
||||||
// add a cube to test collision ...
|
// add a cube to test collision ...
|
||||||
final Entity localBox = new Entity(this.env);
|
final Entity localBox = new Entity(this.env);
|
||||||
@ -198,13 +197,14 @@ public class LoxelApplication extends Application {
|
|||||||
{
|
{
|
||||||
// add a cube to test collision ...
|
// add a cube to test collision ...
|
||||||
final Entity localBox = new Entity(this.env);
|
final Entity localBox = new Entity(this.env);
|
||||||
final Quaternion orientation = new Quaternion(0.3f, 0.3f, 0.4f, 1);
|
final Quaternion orientation = new Quaternion(0.3f, 1.3f, 0.4f, 1);
|
||||||
orientation.normalize();
|
//orientation.normalize();
|
||||||
localBox.addComponent(new ComponentStaticMesh(new Uri("RES", "cube-one.obj")));
|
localBox.addComponent(new ComponentStaticMesh(new Uri("RES", "cube-one.obj")));
|
||||||
localBox.addComponent(new ComponentTexture(new Uri("DATA", "blocks/clay.png")));
|
localBox.addComponent(new ComponentTexture(new Uri("DATA", "blocks/clay.png")));
|
||||||
localBox.addComponent(new ComponentRenderTexturedStaticMesh(new Uri("DATA", "basic.vert"), new Uri("DATA", "basic.frag")));
|
localBox.addComponent(new ComponentRenderTexturedStaticMesh(new Uri("DATA", "basic.vert"), new Uri("DATA", "basic.frag")));
|
||||||
final ComponentPhysics physics2 = new ComponentPhysics(this.env);
|
final ComponentPhysics physics2 = new ComponentPhysics(this.env);
|
||||||
physics2.setTransform(new Transform3D(new Vector3f(2, -2, 14.2f), orientation));
|
physics2.setTransform(new Transform3D(new Vector3f(2, -2, 14.2f), orientation));
|
||||||
|
physics2.setAngularReactionEnable(false);
|
||||||
final Box box2 = new Box();
|
final Box box2 = new Box();
|
||||||
box2.setSize(new Vector3f(0.5f, 0.5f, 0.5f));
|
box2.setSize(new Vector3f(0.5f, 0.5f, 0.5f));
|
||||||
box2.setOrigin(new Vector3f(0, 0, 0));
|
box2.setOrigin(new Vector3f(0, 0, 0));
|
||||||
@ -213,7 +213,6 @@ public class LoxelApplication extends Application {
|
|||||||
localBox.addComponent(physics2);
|
localBox.addComponent(physics2);
|
||||||
this.env.addEntity(localBox);
|
this.env.addEntity(localBox);
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
{
|
{
|
||||||
// this is the floor
|
// this is the floor
|
||||||
final Entity localBox = new Entity(this.env);
|
final Entity localBox = new Entity(this.env);
|
||||||
@ -271,8 +270,8 @@ public class LoxelApplication extends Application {
|
|||||||
this.env.addEntity(gird);
|
this.env.addEntity(gird);
|
||||||
|
|
||||||
final Entity player = new Entity(this.env);
|
final Entity player = new Entity(this.env);
|
||||||
if (false) {
|
if (true) {
|
||||||
final Transform3D playerTransform = new Transform3D(new Vector3f(0, -5, 13));
|
final Transform3D playerTransform = new Transform3D(new Vector3f(0, -5, 1));
|
||||||
//this.objectPosition = new ComponentPositionPlayer();
|
//this.objectPosition = new ComponentPositionPlayer();
|
||||||
//player.addComponent(this.objectPosition);
|
//player.addComponent(this.objectPosition);
|
||||||
this.objectPlayer = new ComponentPlayer();
|
this.objectPlayer = new ComponentPlayer();
|
||||||
@ -285,6 +284,8 @@ public class LoxelApplication extends Application {
|
|||||||
(EngineLight) this.env.getEngine(EngineLight.ENGINE_NAME)));
|
(EngineLight) this.env.getEngine(EngineLight.ENGINE_NAME)));
|
||||||
final ComponentPhysics physics = new ComponentPhysics(this.env, playerTransform);
|
final ComponentPhysics physics = new ComponentPhysics(this.env, playerTransform);
|
||||||
physics.setBodyType(PhysicBodyType.BODY_DYNAMIC);
|
physics.setBodyType(PhysicBodyType.BODY_DYNAMIC);
|
||||||
|
physics.setAngularReactionEnable(false);
|
||||||
|
physics.setSleepingEnable(false);
|
||||||
final Box box = new Box();
|
final Box box = new Box();
|
||||||
box.setSize(new Vector3f(0.3f, 0.3f, 0.9f));
|
box.setSize(new Vector3f(0.3f, 0.3f, 0.9f));
|
||||||
box.setOrigin(new Vector3f(0, 0, 0.9f));
|
box.setOrigin(new Vector3f(0, 0, 0.9f));
|
||||||
@ -324,7 +325,7 @@ public class LoxelApplication extends Application {
|
|||||||
if (tmpEngine != null) {
|
if (tmpEngine != null) {
|
||||||
final EnginePhysics physicsEngine = (EnginePhysics) tmpEngine;
|
final EnginePhysics physicsEngine = (EnginePhysics) tmpEngine;
|
||||||
//Disable gravity for test ...
|
//Disable gravity for test ...
|
||||||
physicsEngine.setGravity(new Vector3f(0.0f, 0.0f, -0.3f));
|
physicsEngine.setGravity(new Vector3f(0.0f, 0.0f, -9.0f));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ready to let Gale & Ege manage the display
|
// ready to let Gale & Ege manage the display
|
@ -1,12 +1,12 @@
|
|||||||
package org.atriasoft.gameengine.samples.LoxelEngine;
|
package org.atriasoft.ege.samples.LoxelEngine;
|
||||||
|
|
||||||
import org.atriasoft.etk.Uri;
|
import org.atriasoft.etk.Uri;
|
||||||
import org.atriasoft.gale.Gale;
|
import org.atriasoft.gale.Gale;
|
||||||
|
|
||||||
public class MainLoxelEngine {
|
public class MainLoxelEngine {
|
||||||
public static void main(final String[] args) {
|
public static void main(final String[] args) {
|
||||||
Uri.setGroup("DATA", "src/org/atriasoft/gameengine/samples/LoxelEngine/res/");
|
Uri.setGroup("DATA", "src/org/atriasoft/ege/samples/LoxelEngine/res/");
|
||||||
Uri.setGroup("DATA_EGE", "src/org/atriasoft/gameengine/data/");
|
Uri.setGroup("DATA_EGE", "src/org/atriasoft/ege/data/");
|
||||||
Uri.setGroup("RES", "res");
|
Uri.setGroup("RES", "res");
|
||||||
Gale.run(new LoxelApplication(), args);
|
Gale.run(new LoxelApplication(), args);
|
||||||
}
|
}
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 8.8 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user