jatria-soft/ege
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DEV] continue rewwork

Browse Source
This commit is contained in:
Edouard DUPIN 2021-03-16 00:29:22 +01:00
parent d8983205f0
commit a92a139875
501 changed files with 445 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -22,7 +22,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/scenarium-logger">
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-gale">
<attributes>
<attribute name="module" value="true"/>
</attributes>
@ -32,12 +32,12 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-gale">
<classpathentry combineaccessrules="false" kind="src" path="/scenarium-logger">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/jReactPhysics3D">
<classpathentry combineaccessrules="false" kind="src" path="/atriasoft-ephysics">
<attributes>
<attribute name="module" value="true"/>
</attributes>

2
README.md
View File

@ -1,4 +1,4 @@
Atria-soft gameengine
Atria-soft ege
==============
[MPL-2] Mozilla public licence (V 2.0)

21
hs_err_pid5076.log Normal file
View 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:

2
src/engineTester/HelloWorld.java
View File

@ -1,5 +1,5 @@
package engineTester;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.ege.Environement;
import org.lwjgl.*;
import org.lwjgl.glfw.*;
import org.lwjgl.opengl.*;

18
src/module-info.java
View File

@ -2,15 +2,15 @@
*
* @author Edouard DUPIN */
open module org.atriasoft.gameengine {
exports org.atriasoft.gameengine;
exports org.atriasoft.gameengine.camera;
exports org.atriasoft.gameengine.components;
exports org.atriasoft.gameengine.engines;
exports org.atriasoft.gameengine.geometry;
exports org.atriasoft.gameengine.map;
exports org.atriasoft.gameengine.physics.shape;
exports org.atriasoft.gameengine.resource;
open module org.atriasoft.ege {
exports org.atriasoft.ege;
exports org.atriasoft.ege.camera;
exports org.atriasoft.ege.components;
exports org.atriasoft.ege.engines;
exports org.atriasoft.ege.geometry;
exports org.atriasoft.ege.map;
exports org.atriasoft.ege.physics.shape;
exports org.atriasoft.ege.resource;
requires transitive org.atriasoft.gale;
requires transitive org.atriasoft.etk;

2
src/org/atriasoft/gameengine/Component.java → src/org/atriasoft/ege/Component.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
public abstract class Component {
public abstract String getType();

14
src/org/atriasoft/gameengine/ControlCameraPlayer.java → src/org/atriasoft/ege/ControlCameraPlayer.java
View File

@ -1,19 +1,19 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import org.atriasoft.etk.math.Transform3D;
import org.atriasoft.etk.math.Vector2f;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.ewol.event.EventEntry;
import org.atriasoft.gale.Gale;
import org.atriasoft.gale.event.EventEntry;
import org.atriasoft.gale.event.EventInput;
import org.atriasoft.gale.event.EventTime;
import org.atriasoft.gale.key.KeyKeyboard;
import org.atriasoft.gale.key.KeyStatus;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentPhysics;
import org.atriasoft.gameengine.components.ComponentPlayer;
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentPhysics;
import org.atriasoft.ege.components.ComponentPlayer;
import org.atriasoft.ege.components.ComponentPositionPlayer;
import org.atriasoft.ege.internal.Log;
public class ControlCameraPlayer implements ControlInterface {
private final Camera camera;

14
src/org/atriasoft/gameengine/ControlCameraPlayerFPS.java → src/org/atriasoft/ege/ControlCameraPlayerFPS.java
View File

@ -1,18 +1,18 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import org.atriasoft.etk.math.Vector2f;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.ewol.event.EventEntry;
import org.atriasoft.gale.Gale;
import org.atriasoft.gale.event.EventEntry;
import org.atriasoft.gale.event.EventInput;
import org.atriasoft.gale.event.EventTime;
import org.atriasoft.gale.key.KeyKeyboard;
import org.atriasoft.gale.key.KeyStatus;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentPlayer;
import org.atriasoft.gameengine.components.ComponentPosition;
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentPlayer;
import org.atriasoft.ege.components.ComponentPosition;
import org.atriasoft.ege.components.ComponentPositionPlayer;
import renderEngine.DisplayManager;

8
src/org/atriasoft/gameengine/ControlCameraSimple.java → src/org/atriasoft/ege/ControlCameraSimple.java
View File

@ -1,13 +1,13 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
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.EventTime;
import org.atriasoft.gale.key.KeyKeyboard;
import org.atriasoft.gale.key.KeyStatus;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.camera.Camera;
public class ControlCameraSimple implements ControlInterface {

4
src/org/atriasoft/gameengine/ControlInterface.java → src/org/atriasoft/ege/ControlInterface.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
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.EventTime;

2
src/org/atriasoft/gameengine/CreatorEntity.java → src/org/atriasoft/ege/CreatorEntity.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
public interface CreatorEntity {

4
src/org/atriasoft/gameengine/Engine.java → src/org/atriasoft/ege/Engine.java
View File

@ -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 {
protected Environement env;

4
src/org/atriasoft/gameengine/Entity.java → src/org/atriasoft/ege/Entity.java
View File

@ -1,10 +1,10 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import java.util.ArrayList;
import java.util.List;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.internal.Log;
public class Entity {
private static int uIDGlobal = 0; //!< This is a reference on a basic Entity ID

2
src/org/atriasoft/gameengine/EntityInteraction.java → src/org/atriasoft/ege/EntityInteraction.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import java.util.ArrayList;
import java.util.List;

26
src/org/atriasoft/gameengine/Environement.java → src/org/atriasoft/ege/Environement.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import java.util.ArrayList;
import java.util.HashMap;
@ -6,25 +6,25 @@ import java.util.List;
import java.util.Map;
import org.atriasoft.etk.math.Vector2f;
import org.atriasoft.ewol.event.EventEntry;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.event.EventEntry;
import org.atriasoft.gale.event.EventInput;
import org.atriasoft.gale.event.EventTime;
import org.atriasoft.gale.key.KeyKeyboard;
import org.atriasoft.gale.key.KeySpecial;
import org.atriasoft.gale.key.KeyStatus;
import org.atriasoft.gale.key.KeyType;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.engines.EngineAI;
import org.atriasoft.gameengine.engines.EngineDynamicMeshs;
import org.atriasoft.gameengine.engines.EngineGravity;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.gameengine.engines.EngineParticle;
import org.atriasoft.gameengine.engines.EnginePhysics;
import org.atriasoft.gameengine.engines.EnginePlayer;
import org.atriasoft.gameengine.engines.EngineRender;
import org.atriasoft.gameengine.internal.Log;
//import org.atriasoft.gameengine.resource.Mesh;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.engines.EngineAI;
import org.atriasoft.ege.engines.EngineDynamicMeshs;
import org.atriasoft.ege.engines.EngineGravity;
import org.atriasoft.ege.engines.EngineLight;
import org.atriasoft.ege.engines.EngineParticle;
import org.atriasoft.ege.engines.EnginePhysics;
import org.atriasoft.ege.engines.EnginePlayer;
import org.atriasoft.ege.engines.EngineRender;
import org.atriasoft.ege.internal.Log;
//import org.atriasoft.ege.resource.Mesh;
public class Environement {
private static Map<String, CreatorEntity> creators = new HashMap<String, CreatorEntity>();

2
src/org/atriasoft/gameengine/GameStatus.java → src/org/atriasoft/ege/GameStatus.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
public enum GameStatus {
gameStart,

2
src/org/atriasoft/gameengine/Light.java → src/org/atriasoft/ege/Light.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/Material.java → src/org/atriasoft/ege/Material.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/ResultNearestEntity.java → src/org/atriasoft/ege/ResultNearestEntity.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
public class ResultNearestEntity {
public Entity entity;

2
src/org/atriasoft/gameengine/Signal.java → src/org/atriasoft/ege/Signal.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine;
package org.atriasoft.ege;
import org.atriasoft.etk.math.Transform3D;

2
src/org/atriasoft/gameengine/camera/Camera.java → src/org/atriasoft/ege/camera/Camera.java
View File

@ -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.Vector3f;

6
src/org/atriasoft/gameengine/components/ComponentAI.java → src/org/atriasoft/ege/components/ComponentAI.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EngineAI;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.engines.EngineAI;
public abstract class ComponentAI extends Component {

10
src/org/atriasoft/gameengine/components/ComponentDynamicMeshs.java → src/org/atriasoft/ege/components/ComponentDynamicMeshs.java
View File

@ -1,14 +1,14 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.atriasoft.ege.Component;
import org.atriasoft.etk.Uri;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EngineDynamicMeshs;
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
import org.atriasoft.ege.engines.EngineDynamicMeshs;
import org.atriasoft.ege.resource.ResourceStaticMesh;
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
public class ComponentDynamicMeshs extends Component {
protected Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();

6
src/org/atriasoft/gameengine/components/ComponentGravity.java → src/org/atriasoft/ege/components/ComponentGravity.java
View File

@ -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.gameengine.Component;
import org.atriasoft.gameengine.Light;
public abstract class ComponentGravity extends Component {
public ComponentGravity() {

6
src/org/atriasoft/gameengine/components/ComponentGravityStatic.java → src/org/atriasoft/ege/components/ComponentGravityStatic.java
View File

@ -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.gameengine.Component;
import org.atriasoft.gameengine.Light;
public class ComponentGravityStatic extends ComponentGravity {
private Vector3f gravity;

6
src/org/atriasoft/gameengine/components/ComponentLight.java → src/org/atriasoft/ege/components/ComponentLight.java
View File

@ -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.gameengine.Component;
import org.atriasoft.gameengine.Light;
public class ComponentLight extends Component {
// the material is not a resource, it can change in time... with AI or selection...

4
src/org/atriasoft/gameengine/components/ComponentLightSun.java → src/org/atriasoft/ege/components/ComponentLightSun.java
View File

@ -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{

6
src/org/atriasoft/gameengine/components/ComponentMap.java → src/org/atriasoft/ege/components/ComponentMap.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EngineMap;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.engines.EngineMap;
public class ComponentMap extends Component {

6
src/org/atriasoft/gameengine/components/ComponentMaterial.java → src/org/atriasoft/ege/components/ComponentMaterial.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Material;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Material;
public class ComponentMaterial extends Component {
// the material is not a resource, it can change in time... with AI or selection...

6
src/org/atriasoft/gameengine/components/ComponentMaterials.java → src/org/atriasoft/ege/components/ComponentMaterials.java
View File

@ -1,10 +1,10 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import java.util.HashMap;
import java.util.Map;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Material;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Material;
public class ComponentMaterials extends Component {
// the material is not a resource, it can change in time... with AI or selection...

6
src/org/atriasoft/gameengine/components/ComponentParticle.java → src/org/atriasoft/ege/components/ComponentParticle.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EngineParticle;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.engines.EngineParticle;
public class ComponentParticle extends Component {

43
src/org/atriasoft/gameengine/components/ComponentPhysics.java → src/org/atriasoft/ege/components/ComponentPhysics.java
View File

@ -1,8 +1,11 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import java.util.ArrayList;
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.RigidBody;
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.Vector3f;
import org.atriasoft.gale.resource.ResourceColored3DObject;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.Signal;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.engines.EnginePhysics;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.physics.shape.Box;
import org.atriasoft.gameengine.physics.shape.Capsule;
import org.atriasoft.gameengine.physics.shape.Concave;
import org.atriasoft.gameengine.physics.shape.Cone;
import org.atriasoft.gameengine.physics.shape.ConvexHull;
import org.atriasoft.gameengine.physics.shape.Cylinder;
import org.atriasoft.gameengine.physics.shape.Shape;
import org.atriasoft.gameengine.physics.shape.Sphere;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.engines.EnginePhysics;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.physics.shape.Box;
import org.atriasoft.ege.physics.shape.Capsule;
import org.atriasoft.ege.physics.shape.Concave;
import org.atriasoft.ege.physics.shape.Cone;
import org.atriasoft.ege.physics.shape.ConvexHull;
import org.atriasoft.ege.physics.shape.Cylinder;
import org.atriasoft.ege.physics.shape.Shape;
import org.atriasoft.ege.physics.shape.Sphere;
public class ComponentPhysics extends Component {
public Signal<Transform3D> signalPosition = new Signal<>();;
@ -63,8 +63,11 @@ public class ComponentPhysics extends Component {
this.rigidBody.setUserData(this);
// set collision callback:
//this.engine.getDynamicWorld().testCollision(this.rigidBody, this);
this.rigidBody.getMaterial().setBounciness(0.0f);
this.rigidBody.setAngularDamping(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("LinearDamping=" + this.rigidBody.getLinearDamping());
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().setRollingResistance(0.01f);
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).
* @param[in] _linearVelocity The angular velocity vector of the body
@ -559,6 +566,10 @@ public class ComponentPhysics extends Component {
this.shape = _prop;
}
public void setSleepingEnable(final boolean value) {
this.rigidBody.setIsAllowedToSleep(value);
}
/**
* @brief set a new transformation
* @param[in] _transform transformation of the position

6
src/org/atriasoft/gameengine/components/ComponentPlayer.java → src/org/atriasoft/ege/components/ComponentPlayer.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EnginePlayer;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.engines.EnginePlayer;
public class ComponentPlayer extends Component {
private float runSpeed = 35;

8
src/org/atriasoft/gameengine/components/ComponentPosition.java → src/org/atriasoft/ege/components/ComponentPosition.java
View File

@ -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.gameengine.Component;
import org.atriasoft.gameengine.Signal;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.internal.Log;
public class ComponentPosition extends Component {
public Signal<Transform3D> signalPosition;

2
src/org/atriasoft/gameengine/components/ComponentPositionPlayer.java → src/org/atriasoft/ege/components/ComponentPositionPlayer.java
View File

@ -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.Vector3f;

6
src/org/atriasoft/gameengine/components/ComponentRender.java → src/org/atriasoft/ege/components/ComponentRender.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.engines.EngineRender;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.engines.EngineRender;
public abstract class ComponentRender extends Component {
private boolean propertyDebugNormal = false;

4
src/org/atriasoft/gameengine/components/ComponentRenderColoredStaticMesh.java → src/org/atriasoft/ege/components/ComponentRenderColoredStaticMesh.java
View File

@ -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.math.Matrix4f;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.resource.ResourceProgram;
import org.atriasoft.gameengine.Component;
public class ComponentRenderColoredStaticMesh extends ComponentRender {
ComponentStaticMesh mesh = null;

12
src/org/atriasoft/gameengine/components/ComponentRenderTexturedMaterialsDynamicMeshs.java → src/org/atriasoft/ege/components/ComponentRenderTexturedMaterialsDynamicMeshs.java
View File

@ -1,17 +1,17 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
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.math.Matrix4f;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.resource.ResourceProgram;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.Material;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.ege.engines.EngineLight;
public class ComponentRenderTexturedMaterialsDynamicMeshs extends ComponentRender {
private static final int numberOfLight = 8;

10
src/org/atriasoft/gameengine/components/ComponentRenderTexturedMaterialsStaticMesh.java → src/org/atriasoft/ege/components/ComponentRenderTexturedMaterialsStaticMesh.java
View File

@ -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.math.Matrix4f;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.resource.ResourceProgram;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.Material;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.ege.engines.EngineLight;
public class ComponentRenderTexturedMaterialsStaticMesh extends ComponentRender {
private static final int numberOfLight = 8;

10
src/org/atriasoft/gameengine/components/ComponentRenderTexturedMaterialsStaticMeshs.java → src/org/atriasoft/ege/components/ComponentRenderTexturedMaterialsStaticMeshs.java
View File

@ -1,16 +1,16 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
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.math.Matrix4f;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.resource.ResourceProgram;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.Material;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.ege.engines.EngineLight;
public class ComponentRenderTexturedMaterialsStaticMeshs extends ComponentRender {
private static final int numberOfLight = 8;

4
src/org/atriasoft/gameengine/components/ComponentRenderTexturedStaticMesh.java → src/org/atriasoft/ege/components/ComponentRenderTexturedStaticMesh.java
View File

@ -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.math.Matrix4f;
import org.atriasoft.gale.backend3d.OpenGL;
import org.atriasoft.gale.resource.ResourceProgram;
import org.atriasoft.gameengine.Component;
public class ComponentRenderTexturedStaticMesh extends ComponentRender {
ComponentStaticMesh mesh = null;

8
src/org/atriasoft/gameengine/components/ComponentStaticMesh.java → src/org/atriasoft/ege/components/ComponentStaticMesh.java
View File

@ -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.gameengine.Component;
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
import org.atriasoft.ege.resource.ResourceStaticMesh;
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
public class ComponentStaticMesh extends Component {
private ResourceStaticMesh mesh = null;

10
src/org/atriasoft/gameengine/components/ComponentStaticMeshs.java → src/org/atriasoft/ege/components/ComponentStaticMeshs.java
View File

@ -1,14 +1,14 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.atriasoft.ege.Component;
import org.atriasoft.etk.Uri;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.resource.ResourceStaticMesh;
import org.atriasoft.gameengine.resource.ResourceStaticMeshObj;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.resource.ResourceStaticMesh;
import org.atriasoft.ege.resource.ResourceStaticMeshObj;
public class ComponentStaticMeshs extends Component {
private Map<String, ResourceStaticMesh> meshs = new HashMap<String, ResourceStaticMesh>();

6
src/org/atriasoft/gameengine/components/ComponentTexture.java → src/org/atriasoft/ege/components/ComponentTexture.java
View File

@ -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.gale.resource.ResourceTexture;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.Component;
import org.atriasoft.ege.internal.Log;
public class ComponentTexture extends Component {

4
src/org/atriasoft/gameengine/components/ComponentTexturePack.java → src/org/atriasoft/ege/components/ComponentTexturePack.java
View File

@ -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 {

8
src/org/atriasoft/gameengine/components/ComponentTextures.java → src/org/atriasoft/ege/components/ComponentTextures.java
View File

@ -1,13 +1,13 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
import java.util.HashMap;
import java.util.Map;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Material;
import org.atriasoft.etk.Uri;
import org.atriasoft.gale.resource.ResourceTexture;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Material;
import org.atriasoft.ege.internal.Log;
public class ComponentTextures extends Component {
private Map<String, ResourceTexture> textures = new HashMap<String, ResourceTexture>();

2
src/org/atriasoft/gameengine/components/GlLightIndex.java → src/org/atriasoft/ege/components/GlLightIndex.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
public class GlLightIndex {
int oGLcolor;

2
src/org/atriasoft/gameengine/components/PhysicBodyType.java → src/org/atriasoft/ege/components/PhysicBodyType.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.components;
package org.atriasoft.ege.components;
public enum PhysicBodyType {
BODY_DYNAMIC,

0
src/org/atriasoft/gameengine/data/simple3D.frag → src/org/atriasoft/ege/data/simple3D.frag
View File

0
src/org/atriasoft/gameengine/data/simple3D.vert → src/org/atriasoft/ege/data/simple3D.vert
View File

0
src/org/atriasoft/gameengine/data/wireColor.frag → src/org/atriasoft/ege/data/wireColor.frag
View File

0
src/org/atriasoft/gameengine/data/wireColor.vert → src/org/atriasoft/ege/data/wireColor.vert
View File

14
src/org/atriasoft/gameengine/engines/EngineAI.java → src/org/atriasoft/ege/engines/EngineAI.java
View File

@ -1,13 +1,13 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.Vector;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentAI;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentAI;
public class EngineAI extends Engine {
public static final String ENGINE_NAME = "ia";

12
src/org/atriasoft/gameengine/engines/EngineDynamicMeshs.java → src/org/atriasoft/ege/engines/EngineDynamicMeshs.java
View File

@ -1,12 +1,12 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.Vector;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentDynamicMeshs;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentDynamicMeshs;
public class EngineDynamicMeshs extends Engine {
public static final String ENGINE_NAME = "dynamic-meshs";

22
src/org/atriasoft/gameengine/engines/EngineGravity.java → src/org/atriasoft/ege/engines/EngineGravity.java
View File

@ -1,18 +1,18 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
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.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentAI;
import org.atriasoft.gameengine.components.ComponentGravity;
import org.atriasoft.gameengine.components.ComponentLight;
import org.atriasoft.gameengine.components.ComponentLightSun;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentAI;
import org.atriasoft.ege.components.ComponentGravity;
import org.atriasoft.ege.components.ComponentLight;
import org.atriasoft.ege.components.ComponentLightSun;
public class EngineGravity extends Engine {
public static final String ENGINE_NAME = "gravity";

20
src/org/atriasoft/gameengine/engines/EngineLight.java → src/org/atriasoft/ege/engines/EngineLight.java
View File

@ -1,17 +1,17 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
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.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentAI;
import org.atriasoft.gameengine.components.ComponentLight;
import org.atriasoft.gameengine.components.ComponentLightSun;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentAI;
import org.atriasoft.ege.components.ComponentLight;
import org.atriasoft.ege.components.ComponentLightSun;
public class EngineLight extends Engine {
public static final String ENGINE_NAME = "light";

12
src/org/atriasoft/gameengine/engines/EngineMap.java → src/org/atriasoft/ege/engines/EngineMap.java
View File

@ -1,12 +1,12 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.Vector;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentMap;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentMap;
public class EngineMap extends Engine {
public static final String ENGINE_NAME = "map";

10
src/org/atriasoft/gameengine/engines/EngineParticle.java → src/org/atriasoft/ege/engines/EngineParticle.java
View File

@ -1,9 +1,9 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
public class EngineParticle extends Engine {
public static final String ENGINE_NAME = "particle";

22
src/org/atriasoft/gameengine/engines/EnginePhysics.java → src/org/atriasoft/ege/engines/EnginePhysics.java
View File

@ -1,8 +1,11 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.List;
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.collision.ContactManifold;
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.Vector3f;
import org.atriasoft.gale.resource.ResourceColored3DObject;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentPhysics;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentPhysics;
import org.atriasoft.ege.internal.Log;
public class EnginePhysics extends Engine implements EventListener {
public static final String ENGINE_NAME = "physics";
// 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 propertyDebugShape = false;
// Start engine with no gravity
@ -176,7 +176,7 @@ public class EnginePhysics extends Engine implements EventListener {
}
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 (int iii = 0; iii < it.getNbContactPoints(); iii++) {
final ContactPoint contact = it.getContactPoint(iii);
@ -198,7 +198,7 @@ public class EnginePhysics extends Engine implements EventListener {
@Override
public void update(long deltaMili) {
Log.error("=================================================================" + deltaMili);
//Log.error("=================================================================" + deltaMili);
if (deltaMili > 1000) {
deltaMili = (long) (TIME_STEP * 1000.0f);
}
@ -207,7 +207,7 @@ public class EnginePhysics extends Engine implements EventListener {
this.accumulator += deltaTime;
// While there is enough accumulated time to take one or several physics steps
while (this.accumulator >= TIME_STEP) {
Log.error("---------------------------------------------------" + TIME_STEP);
//Log.error("---------------------------------------------------" + TIME_STEP);
if (this.dynamicsWorld != null) {
// call every object to usdate their constant forces applied
for (final ComponentPhysics it : this.components) {

14
src/org/atriasoft/gameengine/engines/EnginePlayer.java → src/org/atriasoft/ege/engines/EnginePlayer.java
View File

@ -1,13 +1,13 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.Vector;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentPlayer;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentPlayer;
public class EnginePlayer extends Engine {
public static final String ENGINE_NAME = "player";

12
src/org/atriasoft/gameengine/engines/EngineRender.java → src/org/atriasoft/ege/engines/EngineRender.java
View File

@ -1,12 +1,12 @@
package org.atriasoft.gameengine.engines;
package org.atriasoft.ege.engines;
import java.util.Vector;
import org.atriasoft.gameengine.Component;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentRender;
import org.atriasoft.ege.Component;
import org.atriasoft.ege.Engine;
import org.atriasoft.ege.Environement;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentRender;
public class EngineRender extends Engine {
public static final String ENGINE_NAME = "render";

2
src/org/atriasoft/gameengine/geometry/AABB.java → src/org/atriasoft/ege/geometry/AABB.java
View File

@ -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.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Geometry3D.java → src/org/atriasoft/ege/geometry/Geometry3D.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Line.java → src/org/atriasoft/ege/geometry/Line.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/geometry/OBB.java → src/org/atriasoft/ege/geometry/OBB.java
View File

@ -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.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Plane.java → src/org/atriasoft/ege/geometry/Plane.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Ray.java → src/org/atriasoft/ege/geometry/Ray.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Sphere.java → src/org/atriasoft/ege/geometry/Sphere.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/geometry/Triangle.java → src/org/atriasoft/ege/geometry/Triangle.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.geometry;
package org.atriasoft.ege.geometry;
import org.atriasoft.etk.math.Vector3f;

2
src/org/atriasoft/gameengine/internal/Log.java → src/org/atriasoft/ege/internal/Log.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.internal;
package org.atriasoft.ege.internal;
import io.scenarium.logger.LogLevel;
import io.scenarium.logger.Logger;

8
src/org/atriasoft/gameengine/map/ComponentDynamicMeshsVoxelMap.java → src/org/atriasoft/ege/map/ComponentDynamicMeshsVoxelMap.java
View File

@ -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.Vector3f;
import org.atriasoft.etk.math.Vector3i;
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.gameengine.components.ComponentDynamicMeshs;
import org.atriasoft.gameengine.resource.ResourceListTexturedMesh;
import org.atriasoft.ege.internal.Log;
import org.atriasoft.ege.components.ComponentDynamicMeshs;
import org.atriasoft.ege.resource.ResourceListTexturedMesh;
public class ComponentDynamicMeshsVoxelMap extends ComponentDynamicMeshs {
private VoxelChunk chunk;

6
src/org/atriasoft/gameengine/map/ComponentRenderVoxelMesh.java → src/org/atriasoft/ege/map/ComponentRenderVoxelMesh.java
View File

@ -1,8 +1,8 @@
package org.atriasoft.gameengine.map;
package org.atriasoft.ege.map;
import org.atriasoft.etk.Uri;
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMeshs;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMeshs;
import org.atriasoft.ege.engines.EngineLight;
public class ComponentRenderVoxelMesh extends ComponentRenderTexturedMaterialsStaticMeshs {

38
src/org/atriasoft/gameengine/map/MapVoxel.java → src/org/atriasoft/ege/map/MapVoxel.java
View File

@ -1,30 +1,30 @@
package org.atriasoft.gameengine.map;
package org.atriasoft.ege.map;
import java.util.ArrayList;
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.math.Transform3D;
import org.atriasoft.etk.math.Vector3i;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gameengine.Entity;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.Material;
import org.atriasoft.gameengine.components.ComponentLight;
import org.atriasoft.gameengine.components.ComponentLightSun;
import org.atriasoft.gameengine.components.ComponentMaterials;
import org.atriasoft.gameengine.components.ComponentPhysics;
import org.atriasoft.gameengine.components.ComponentPosition;
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsDynamicMeshs;
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMeshs;
import org.atriasoft.gameengine.components.ComponentRenderTexturedStaticMesh;
import org.atriasoft.gameengine.components.ComponentStaticMesh;
import org.atriasoft.gameengine.components.ComponentStaticMeshs;
import org.atriasoft.gameengine.components.ComponentTexture;
import org.atriasoft.gameengine.components.ComponentTextures;
import org.atriasoft.gameengine.engines.EngineLight;
import org.atriasoft.gameengine.engines.EngineMap;
import org.atriasoft.ege.components.ComponentLight;
import org.atriasoft.ege.components.ComponentLightSun;
import org.atriasoft.ege.components.ComponentMaterials;
import org.atriasoft.ege.components.ComponentPhysics;
import org.atriasoft.ege.components.ComponentPosition;
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsDynamicMeshs;
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMeshs;
import org.atriasoft.ege.components.ComponentRenderTexturedStaticMesh;
import org.atriasoft.ege.components.ComponentStaticMesh;
import org.atriasoft.ege.components.ComponentStaticMeshs;
import org.atriasoft.ege.components.ComponentTexture;
import org.atriasoft.ege.components.ComponentTextures;
import org.atriasoft.ege.engines.EngineLight;
import org.atriasoft.ege.engines.EngineMap;
public class MapVoxel extends EngineMap {
//List<VoxelChunk> listOfChunks = new ArrayList<VoxelChunk>();

2
src/org/atriasoft/gameengine/map/Voxel.java → src/org/atriasoft/ege/map/Voxel.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.map;
package org.atriasoft.ege.map;
public class Voxel {
public int type = VoxelType.NATIVE_UNKNOWN;

4
src/org/atriasoft/gameengine/map/VoxelChunk.java → src/org/atriasoft/ege/map/VoxelChunk.java
View File

@ -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.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...
public class VoxelChunk extends ComponentMap {

2
src/org/atriasoft/gameengine/map/VoxelType.java → src/org/atriasoft/ege/map/VoxelType.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.map;
package org.atriasoft.ege.map;
public class VoxelType {
public static final int NATIVE_UNKNOWN = 0;

2
src/org/atriasoft/gameengine/physics/shape/Box.java → src/org/atriasoft/ege/physics/shape/Box.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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;

2
src/org/atriasoft/gameengine/physics/shape/Capsule.java → src/org/atriasoft/ege/physics/shape/Capsule.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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;

4
src/org/atriasoft/gameengine/physics/shape/Concave.java → src/org/atriasoft/ege/physics/shape/Concave.java
View File

@ -3,13 +3,13 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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.List;
import org.atriasoft.etk.math.Vector3f;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.internal.Log;
public class Concave extends Shape {
private List<Vector3f> vertexes = new ArrayList<>();

2
src/org/atriasoft/gameengine/physics/shape/Cone.java → src/org/atriasoft/ege/physics/shape/Cone.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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;

2
src/org/atriasoft/gameengine/physics/shape/ConvexHull.java → src/org/atriasoft/ege/physics/shape/ConvexHull.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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.List;

2
src/org/atriasoft/gameengine/physics/shape/Cylinder.java → src/org/atriasoft/ege/physics/shape/Cylinder.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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;

2
src/org/atriasoft/gameengine/physics/shape/Shape.java → src/org/atriasoft/ege/physics/shape/Shape.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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.Vector3f;

2
src/org/atriasoft/gameengine/physics/shape/Sphere.java → src/org/atriasoft/ege/physics/shape/Sphere.java
View File

@ -3,7 +3,7 @@
* @copyright 2011, Edouard DUPIN, all right reserved
* @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;

4
src/org/atriasoft/gameengine/resource/ResourceListTexturedMesh.java → src/org/atriasoft/ege/resource/ResourceListTexturedMesh.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.resource;
package org.atriasoft.ege.resource;
import java.util.ArrayList;
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.resource.ResourceVirtualArrayObject;
import org.atriasoft.gameengine.internal.Log;
import org.atriasoft.ege.internal.Log;
public class ResourceListTexturedMesh extends ResourceStaticMesh {

0
src/org/atriasoft/gameengine/resource/ResourceMesh.java__ → src/org/atriasoft/ege/resource/ResourceMesh.java__
View File

4
src/org/atriasoft/gameengine/resource/ResourceStaticColoredMesh.java → src/org/atriasoft/ege/resource/ResourceStaticColoredMesh.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.resource;
package org.atriasoft.ege.resource;
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.resource.ResourceVirtualArrayObject;

2
src/org/atriasoft/gameengine/resource/ResourceStaticMesh.java → src/org/atriasoft/ege/resource/ResourceStaticMesh.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.resource;
package org.atriasoft.ege.resource;
import org.atriasoft.etk.Uri;
import org.atriasoft.gale.backend3d.OpenGL.RenderMode;

4
src/org/atriasoft/gameengine/resource/ResourceStaticMeshObj.java → src/org/atriasoft/ege/resource/ResourceStaticMeshObj.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.resource;
package org.atriasoft.ege.resource;
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.resource.Resource;

4
src/org/atriasoft/gameengine/resource/ResourceStaticTexturedMesh.java → src/org/atriasoft/ege/resource/ResourceStaticTexturedMesh.java
View File

@ -1,7 +1,7 @@
package org.atriasoft.gameengine.resource;
package org.atriasoft.ege.resource;
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.resource.ResourceVirtualArrayObject;

2
src/org/atriasoft/gameengine/samples/LoxelEngine/Log.java → src/org/atriasoft/ege/samples/LoxelEngine/Log.java
View File

@ -1,4 +1,4 @@
package org.atriasoft.gameengine.samples.LoxelEngine;
package org.atriasoft.ege.samples.LoxelEngine;
public class Log {
private Log() {}

71
src/org/atriasoft/gameengine/samples/LoxelEngine/LoxelApplication.java → src/org/atriasoft/ege/samples/LoxelEngine/LoxelApplication.java
View File

@ -1,8 +1,15 @@
package org.atriasoft.gameengine.samples.LoxelEngine;
package org.atriasoft.ege.samples.LoxelEngine;
import java.util.ArrayList;
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.Uri;
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.KeyType;
import org.atriasoft.gale.resource.ResourceColored3DObject;
import org.atriasoft.gameengine.ControlCameraPlayer;
import org.atriasoft.gameengine.Engine;
import org.atriasoft.gameengine.Entity;
import org.atriasoft.gameengine.Environement;
import org.atriasoft.gameengine.GameStatus;
import org.atriasoft.gameengine.Light;
import org.atriasoft.gameengine.Material;
import org.atriasoft.gameengine.camera.Camera;
import org.atriasoft.gameengine.components.ComponentGravityStatic;
import org.atriasoft.gameengine.components.ComponentLight;
import org.atriasoft.gameengine.components.ComponentLightSun;
import org.atriasoft.gameengine.components.ComponentMaterial;
import org.atriasoft.gameengine.components.ComponentPhysics;
import org.atriasoft.gameengine.components.ComponentPlayer;
import org.atriasoft.gameengine.components.ComponentPosition;
import org.atriasoft.gameengine.components.ComponentPositionPlayer;
import org.atriasoft.gameengine.components.ComponentRenderColoredStaticMesh;
import org.atriasoft.gameengine.components.ComponentRenderTexturedMaterialsStaticMesh;
import org.atriasoft.gameengine.components.ComponentRenderTexturedStaticMesh;
import org.atriasoft.gameengine.components.ComponentStaticMesh;
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;
import org.atriasoft.ege.camera.Camera;
import org.atriasoft.ege.components.ComponentGravityStatic;
import org.atriasoft.ege.components.ComponentLight;
import org.atriasoft.ege.components.ComponentLightSun;
import org.atriasoft.ege.components.ComponentMaterial;
import org.atriasoft.ege.components.ComponentPhysics;
import org.atriasoft.ege.components.ComponentPlayer;
import org.atriasoft.ege.components.ComponentPosition;
import org.atriasoft.ege.components.ComponentPositionPlayer;
import org.atriasoft.ege.components.ComponentRenderColoredStaticMesh;
import org.atriasoft.ege.components.ComponentRenderTexturedMaterialsStaticMesh;
import org.atriasoft.ege.components.ComponentRenderTexturedStaticMesh;
import org.atriasoft.ege.components.ComponentStaticMesh;
import org.atriasoft.ege.components.ComponentTexture;
import org.atriasoft.ege.components.PhysicBodyType;
import org.atriasoft.ege.engines.EngineLight;
import org.atriasoft.ege.engines.EnginePhysics;
import org.atriasoft.ege.map.MapVoxel;
import org.atriasoft.ege.physics.shape.Box;
import org.atriasoft.ege.tools.MeshGenerator;
public class LoxelApplication extends Application {
// public static ComponentPosition relativeTestPos;
@ -126,7 +126,6 @@ public class LoxelApplication extends Application {
localBox.addComponent(physics2);
this.env.addEntity(localBox);
}
/*
{
// add a cube to test collision ...
final Entity localBox = new Entity(this.env);
@ -198,13 +197,14 @@ public class LoxelApplication extends Application {
{
// add a cube to test collision ...
final Entity localBox = new Entity(this.env);
final Quaternion orientation = new Quaternion(0.3f, 0.3f, 0.4f, 1);
orientation.normalize();
final Quaternion orientation = new Quaternion(0.3f, 1.3f, 0.4f, 1);
//orientation.normalize();
localBox.addComponent(new ComponentStaticMesh(new Uri("RES", "cube-one.obj")));
localBox.addComponent(new ComponentTexture(new Uri("DATA", "blocks/clay.png")));
localBox.addComponent(new ComponentRenderTexturedStaticMesh(new Uri("DATA", "basic.vert"), new Uri("DATA", "basic.frag")));
final ComponentPhysics physics2 = new ComponentPhysics(this.env);
physics2.setTransform(new Transform3D(new Vector3f(2, -2, 14.2f), orientation));
physics2.setAngularReactionEnable(false);
final Box box2 = new Box();
box2.setSize(new Vector3f(0.5f, 0.5f, 0.5f));
box2.setOrigin(new Vector3f(0, 0, 0));
@ -213,7 +213,6 @@ public class LoxelApplication extends Application {
localBox.addComponent(physics2);
this.env.addEntity(localBox);
}
*/
{
// this is the floor
final Entity localBox = new Entity(this.env);
@ -271,8 +270,8 @@ public class LoxelApplication extends Application {
this.env.addEntity(gird);
final Entity player = new Entity(this.env);
if (false) {
final Transform3D playerTransform = new Transform3D(new Vector3f(0, -5, 13));
if (true) {
final Transform3D playerTransform = new Transform3D(new Vector3f(0, -5, 1));
//this.objectPosition = new ComponentPositionPlayer();
//player.addComponent(this.objectPosition);
this.objectPlayer = new ComponentPlayer();
@ -285,6 +284,8 @@ public class LoxelApplication extends Application {
(EngineLight) this.env.getEngine(EngineLight.ENGINE_NAME)));
final ComponentPhysics physics = new ComponentPhysics(this.env, playerTransform);
physics.setBodyType(PhysicBodyType.BODY_DYNAMIC);
physics.setAngularReactionEnable(false);
physics.setSleepingEnable(false);
final Box box = new Box();
box.setSize(new Vector3f(0.3f, 0.3f, 0.9f));
box.setOrigin(new Vector3f(0, 0, 0.9f));
@ -324,7 +325,7 @@ public class LoxelApplication extends Application {
if (tmpEngine != null) {
final EnginePhysics physicsEngine = (EnginePhysics) tmpEngine;
//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

6
src/org/atriasoft/gameengine/samples/LoxelEngine/MainLoxelEngine.java → src/org/atriasoft/ege/samples/LoxelEngine/MainLoxelEngine.java
View File

@ -1,12 +1,12 @@
package org.atriasoft.gameengine.samples.LoxelEngine;
package org.atriasoft.ege.samples.LoxelEngine;
import org.atriasoft.etk.Uri;
import org.atriasoft.gale.Gale;
public class MainLoxelEngine {
public static void main(final String[] args) {
Uri.setGroup("DATA", "src/org/atriasoft/gameengine/samples/LoxelEngine/res/");
Uri.setGroup("DATA_EGE", "src/org/atriasoft/gameengine/data/");
Uri.setGroup("DATA", "src/org/atriasoft/ege/samples/LoxelEngine/res/");
Uri.setGroup("DATA_EGE", "src/org/atriasoft/ege/data/");
Uri.setGroup("RES", "res");
Gale.run(new LoxelApplication(), args);
}

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/basic.frag → src/org/atriasoft/ege/samples/LoxelEngine/res/basic.frag
View File

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/basic.vert → src/org/atriasoft/ege/samples/LoxelEngine/res/basic.vert
View File

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/basicMaterial.frag → src/org/atriasoft/ege/samples/LoxelEngine/res/basicMaterial.frag
View File

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/basicMaterial.vert → src/org/atriasoft/ege/samples/LoxelEngine/res/basicMaterial.vert
View File

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/blocks/.DS_Store → src/org/atriasoft/ege/samples/LoxelEngine/res/blocks/.DS_Store vendored
View File

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/blocks/anvil_base.png → src/org/atriasoft/ege/samples/LoxelEngine/res/blocks/anvil_base.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

0
src/org/atriasoft/gameengine/samples/LoxelEngine/res/blocks/anvil_top_damaged_0.png → src/org/atriasoft/ege/samples/LoxelEngine/res/blocks/anvil_top_damaged_0.png
View File

Side by Side Swipe Overlay

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