diff --git a/GameEngine/resources/GameEngineTest.model b/GameEngine/resources/GameEngineTest.model index 9d48131..c0e02a7 100644 --- a/GameEngine/resources/GameEngineTest.model +++ b/GameEngine/resources/GameEngineTest.model @@ -1,60 +1,4 @@ init { -enemy := { - "001": { - "transform": { - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "scale": { - "x": 1.0, - "y": 1.0, - "z": 1.0 - }, - "position": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - "move": { - "type": straight, - "speed": 5.0 - }, - "mesh": { - "sprite": "GameEngine/resources/enemy1.png", - "type": "sprite" - } - }, - "002": { - "transform": { - "rotation": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "scale": { - "x": 1.0, - "y": 1.0, - "z": 1.0 - }, - "position": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - "move": { - "type": straight, - "speed": 5.0 - }, - "mesh": { - "sprite": "GameEngine/resources/enemy1.png", - "type": "sprite" - } - } -} player := { "transform": { "rotation": { @@ -78,10 +22,28 @@ "type": "sprite" } } -timers := { - "000": { - "count": 0, - "interval": 100 +enemy1 := { + "eid": "1", + "transform": { + "rotation": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + }, + "position": { + "x": 600.0, + "y": 450.0, + "z": 0.0 + } + }, + "mesh": { + "sprite": "GameEngine/resources/enemy1.png", + "type": "sprite" } } } @@ -113,9 +75,10 @@ native channel EntityPositionUpdate(eid:Str) { in scene.entities.{eid:Str}.transform.position(curPos:Json,updatePosition(nextPos.x,nextPos.y,nextPos.z)) = nextPos } -channel MoveEnemy(eid:Str) { - in enemies.{eid:Str}.transform.position(curPos:Json,moveEnemy(nextPos)) = nextPos - out scene.entities.{eid:Str}.transform.position(curPos:Json,moveEnemy(nextPos)) = nextPos +channel MoveEnemy1(eid:Str) { + in enemy1.transform.position(curPos:Json,moveEnemy1(nextPos,eid)) = nextPos + ref enemy1.eid(eid,moveEnemy1(nextPos,eid)) + out enemy1.transform.position(curPos:Json,moveEnemy1(nextPos,eid)) = nextPos } native channel CameraProjectionUpdate { in scene.camera.projection(curProj:Json,updateProjection(curProj,nextProj)) = nextProj @@ -123,6 +86,16 @@ native channel CameraScaleUpdate { in scene.camera.transform.scale(curScale:Json,updateScale(nextScale.x,nextScale.y,nextScale.z)) = nextScale } +channel UpdateEnemy1(tid:Str) { + in timers.{tid:Str}.count(curCount:Long,updateEnemy1(type,speed)) = nextCount + ref enemy1.move.speed(speed:Float,updateEnemy1(type,speed)) + ref enemy1.move.type(type:Str,updateEnemy1(type,speed)) + out enemy1.transform.position(curPos:Json,updateEnemy1(type,speed)) = { + "x": curPos.x, + "y": (curPos.y+speed), + "z": curPos.z +} +} native channel EntitySpriteUpdate(eid:Str) { in scene.entities.{eid:Str}.mesh(curMesh:Json,updateSprite(spritePath:Str)) = { "sprite": spritePath, @@ -132,23 +105,14 @@ native channel EntityScaleUpdate(eid:Str) { in scene.entities.{eid:Str}.transform.scale(curScale:Json,updateScale(nextScale.x,nextScale.y,nextScale.z)) = nextScale } -channel RotateEnemy(eid:Str) { - in enemies.{eid:Str}.transform.rotation(curRot:Json,rotateEnemy(nextRot)) = nextRot - out enemies.{eid:Str}.transform.rotation(curRot:Json,rotateEnemy(nextRot)) = nextRot -} -channel UpdateEnemy(tid:Str, eid:Str) { - in timers.{tid:Str}.count(curCount:Long,updateEnemy(type,speed)) = nextCount - ref enemies.{eid:Str}.move.speed(speed:Float,updateEnemy(type,speed)) - ref enemies.{eid:Str}.move.type(type:Str,updateEnemy(type,speed)) - out enemies.{eid:Str}.transform.position(curPos:Json,updateEnemy(type,speed)) = { - "x": curPos.x, - "y": (curPos.y+speed), - "z": curPos.z -} -} native channel TimersUpdated { in timers(curTimers:Map,update(curTimers,nextTimers)) = nextTimers } +channel RotateEnemy1(eid:Str) { + in enemy1.transform.rotation(curRot:Json,rotateEnemy1(nextRot,eid)) = nextRot + ref enemy1.eid(eid,rotateEnemy1(nextRot,eid)) + out enemy1.transform.rotation(curRot:Json,rotateEnemy1(nextRot,eid)) = nextRot +} native channel CameraPositionUpdate { in scene.camera.transform.position(curPos:Json,updatePosition(nextPos.x,nextPos.y,nextPos.z)) = nextPos } diff --git a/GameEngine/src/main/java/gameEngine/GameEngineModelFileGenerator.java b/GameEngine/src/main/java/gameEngine/GameEngineModelFileGenerator.java index e48e5dd..9080c96 100644 --- a/GameEngine/src/main/java/gameEngine/GameEngineModelFileGenerator.java +++ b/GameEngine/src/main/java/gameEngine/GameEngineModelFileGenerator.java @@ -1,6 +1,11 @@ package gameEngine; import algorithms.TypeInference; +import gameEngine.entites.EditorEntity; +import gameEngine.entites.Entity; +import gameEngine.entites.editorComponents.EntityView; +import gameEngine.geometry.Transform; +import gameEngine.scenes.EditorScene; import gameEngine.views.Window; import models.algebra.Constant; import models.algebra.Expression; @@ -11,6 +16,8 @@ import parser.Parser; import parser.Parser.TokenStream; import parser.exceptions.*; +import simulator.Event; +import simulator.ResourceIdentifier; import simulator.Simulator; import gameEngine.simulator.interfaces.GameEnginePresenter; import simulator.SystemState; @@ -32,7 +39,7 @@ public void generate(){ try { - + EditorScene editorScene = (EditorScene) Window.get().getScene(); model = new DataTransferModel(); ResourcePath scene = new ResourcePath("scene"); // "scene" ResourcePath scene_time = new ResourcePath(scene, "time"); // "scene.time" @@ -59,14 +66,35 @@ ResourcePath timer = new ResourcePath(timers, new Variable("tid", DataConstraintModel.typeString)); // "timers.{tid}" ResourcePath timer_count = new ResourcePath(timer, "count"); //"timer.{tid}.count - ResourcePath enemies = new ResourcePath("enemies"); - ResourcePath enemy = new ResourcePath(enemies, new Variable("eid", DataConstraintModel.typeString)); - ResourcePath enemy_transform = new ResourcePath(enemy, "transform"); - ResourcePath enemy_transform_position = new ResourcePath(enemy_transform, "position"); - ResourcePath enemy_transform_rotation = new ResourcePath(enemy_transform, "rotation"); - ResourcePath enemy_move = new ResourcePath(enemy, "move"); - ResourcePath enemy_move_type = new ResourcePath(enemy_move, "type"); - ResourcePath enemy_move_speed = new ResourcePath(enemy_move, "speed"); + List enemy = new ArrayList<>(); + List enemy_transform = new ArrayList<>(); + List enemy_transform_position = new ArrayList<>(); + List enemy_transform_rotation = new ArrayList<>(); + List enemy_move = new ArrayList<>(); + List enemy_move_type = new ArrayList<>(); + List enemy_move_speed = new ArrayList<>(); + List enemy_eid = new ArrayList<>(); + for (int i = 1; i < editorScene.editorEntities.size(); i++) { + EditorEntity editorEntity = (EditorEntity) editorScene.getEditorEntity("" + i); + String id = editorEntity.getId(); + + ResourcePath e = new ResourcePath("enemy" + id); + ResourcePath et = new ResourcePath(e, "transform"); + ResourcePath etp = new ResourcePath(et, "position"); + ResourcePath etr = new ResourcePath(et, "rotation"); + ResourcePath em = new ResourcePath(e,"move"); + ResourcePath emt = new ResourcePath(em,"type"); + ResourcePath ems = new ResourcePath(em,"speed"); + ResourcePath eid = new ResourcePath(e, "eid"); + enemy.add(e); + enemy_transform.add(et); + enemy_transform_position.add(etp); + enemy_transform_rotation.add(etr); + enemy_move.add(em); + enemy_move_type.add(emt); + enemy_move_speed.add(ems); + enemy_eid.add(eid); + } model.addResourcePath(scene_time); model.addResourcePath(scene_camera); @@ -83,12 +111,13 @@ model.addResourcePath(key_state); model.addResourcePath(timers); model.addResourcePath(timer_count); - model.addResourcePath(enemy_transform); - model.addResourcePath(enemy_transform_position); - model.addResourcePath(enemy_transform_rotation); - model.addResourcePath(enemy_move); - model.addResourcePath(enemy_move_type); - model.addResourcePath(enemy_move_speed); + + for (ResourcePath et : enemy_transform) model.addResourcePath(et); + for (ResourcePath etp : enemy_transform) model.addResourcePath(etp); + for (ResourcePath etr : enemy_transform) model.addResourcePath(etr); + for (ResourcePath em : enemy_transform) model.addResourcePath(em); + for (ResourcePath emt : enemy_transform) model.addResourcePath(emt); + for (ResourcePath ems : enemy_transform) model.addResourcePath(ems); addInit(); @@ -245,67 +274,83 @@ "{\"x\": x, \"y\": y, \"z\": z}") ); - addChannel( - new DataTransferChannel("MoveEnemy", new Variable("eid", DataConstraintModel.typeString)), - new ChannelMemberDefinition( - ChannelMemberDefinition.ChannelMemberType.In, - enemy_transform_position, - "curPos: Json", - "moveEnemy(nextPos)", - "nextPos"), - new ChannelMemberDefinition( - ChannelMemberDefinition.ChannelMemberType.Out, - entity_transform_position, - "curPos: Json", - "moveEnemy(nextPos)", - "nextPos") - ); + for (int i = 1; i < editorScene.editorEntities.size(); i++) { + EditorEntity editorEntity = (EditorEntity) editorScene.getEditorEntity("" + i); + String id = editorEntity.getId(); + if (editorEntity.getEditorComponent(EntityView.class) != null) { - addChannel( - new DataTransferChannel("RotateEnemy", new Variable("eid", DataConstraintModel.typeString)), - new ChannelMemberDefinition( - ChannelMemberDefinition.ChannelMemberType.In, - enemy_transform_rotation, - "curRot: Json", - "rotateEnemy(nextRot)", - "nextRot"), - new ChannelMemberDefinition( - ChannelMemberDefinition.ChannelMemberType.Out, - enemy_transform_rotation, - "curRot: Json", - "rotateEnemy(nextRot)", - "nextRot") - ); - - addChannel( - new DataTransferChannel("UpdateEnemy", Arrays.asList( - new Variable("tid", DataConstraintModel.typeString), - new Variable("eid", DataConstraintModel.typeString))), - new ChannelMemberDefinition( - ChannelMemberDefinition.ChannelMemberType.In, - timer_count, - "curCount: Long", - "updateEnemy(type, speed)", - "nextCount"), + addChannel( + new DataTransferChannel("UpdateEnemy" + id, new Variable("tid", DataConstraintModel.typeString)), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.In, + timer_count, + "curCount: Long", + "updateEnemy" + id + "(type, speed)", + "nextCount"), new ChannelMemberDefinition( ChannelMemberDefinition.ChannelMemberType.Ref, - enemy_move_type, + enemy_move_type.get(i - 1), "type: Str", - "updateEnemy(type, speed)"), + "updateEnemy" + id + "(type, speed)"), new ChannelMemberDefinition( ChannelMemberDefinition.ChannelMemberType.Ref, - enemy_move_speed, + enemy_move_speed.get(i - 1), "speed: Float", - "updateEnemy(type, speed)"), + "updateEnemy" + id + "(type, speed)"), new ChannelMemberDefinition( ChannelMemberDefinition.ChannelMemberType.Out, - enemy_transform_position, + enemy_transform_position.get(i - 1), "curPos: Json", - "updateEnemy(type, speed)", + "updateEnemy" + id + "(type, speed)", "{\"x\": curPos.x, \"y\": curPos.y + speed, \"z\": curPos.z}") - ); + ); - addChannel( + addChannel( + new DataTransferChannel("MoveEnemy" + id, new Variable("eid", DataConstraintModel.typeString)), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.In, + enemy_transform_position.get(i - 1), + "curPos: Json", + "moveEnemy" + id + "(nextPos, eid)", + "nextPos"), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.Ref, + enemy_eid.get(i - 1), + "eid", + "moveEnemy" + id + "(nextPos, eid)"), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.Out, + enemy_transform_position.get(i - 1), + "curPos: Json", + "moveEnemy" + id + "(nextPos, eid)", + "nextPos") + ); + + addChannel( + new DataTransferChannel("RotateEnemy" + id, new Variable("eid", DataConstraintModel.typeString)), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.In, + enemy_transform_rotation.get(i - 1), + "curRot: Json", + "rotateEnemy" + id + "(nextRot, eid)", + "nextRot"), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.Ref, + enemy_eid.get(i - 1), + "eid", + "rotateEnemy" + id + "(nextRot, eid)"), + new ChannelMemberDefinition( + ChannelMemberDefinition.ChannelMemberType.Out, + enemy_transform_rotation.get(i - 1), + "curRot: Json", + "rotateEnemy" + id + "(nextRot, eid)", + "nextRot") + ); + + } + } + + DataTransferChannel startTimerChannel = addChannel( new DataTransferChannel("StartTimer"), new ChannelMemberDefinition( ChannelMemberDefinition.ChannelMemberType.Out, @@ -326,6 +371,7 @@ ); + if (stream.hasNext()) stream.next(); save(); @@ -333,37 +379,37 @@ TypeInference.infer(model); Simulator simulator = new Simulator(model); Window window = Window.get(); - window.changeScene(1); + window.changeScene(2); GameEnginePresenter presenter = new GameEnginePresenter(window.getScene(), simulator); TimerService timerService = new TimerService(simulator); - + SystemState initialState = simulator.init(); -// stream.addLine("updateCameraPosition(0.0,0.0,0.0)"); -// Expression messageUpdateCPos = parser.parseTerm(stream, model); -// Event updateCameraPos = new Event(updateCameraPosChannel, messageUpdateCPos, scene_camera_transform_position, initialState.getResource(ResourceIdentifier.createFrom(scene_camera_transform_position))); -// simulator.transition(updateCameraPos); + stream.addLine("startTimer(\"000\", 100)"); + Expression messageStartTimer = parser.parseTerm(stream, model); + Event startTimer = new Event(startTimerChannel, messageStartTimer, timer, initialState.getResource(ResourceIdentifier.createFrom(timer))); + simulator.transition(startTimer); } catch (Exception e) { e.printStackTrace(); } } - private JsonTerm createTransformTerm(){ + private JsonTerm createTransformTerm(Transform transform){ JsonTerm positionTerm = new JsonTerm(); - positionTerm.addMember("x", new Constant(String.valueOf(0.0))); - positionTerm.addMember("y", new Constant(String.valueOf(0.0))); - positionTerm.addMember("z", new Constant(String.valueOf(0.0))); + positionTerm.addMember("x", new Constant(String.valueOf(transform.position.x))); + positionTerm.addMember("y", new Constant(String.valueOf(transform.position.y))); + positionTerm.addMember("z", new Constant(String.valueOf(transform.position.z))); JsonTerm rotationTerm = new JsonTerm(); - rotationTerm.addMember("x", new Constant(String.valueOf(0.0))); - rotationTerm.addMember("y", new Constant(String.valueOf(0.0))); - rotationTerm.addMember("z", new Constant(String.valueOf(0.0))); + rotationTerm.addMember("x", new Constant(String.valueOf(transform.rotation.x))); + rotationTerm.addMember("y", new Constant(String.valueOf(transform.rotation.y))); + rotationTerm.addMember("z", new Constant(String.valueOf(transform.rotation.z))); JsonTerm scaleTerm = new JsonTerm(); - scaleTerm.addMember("x", new Constant(String.valueOf(1.0))); - scaleTerm.addMember("y", new Constant(String.valueOf(1.0))); - scaleTerm.addMember("z", new Constant(String.valueOf(1.0))); + scaleTerm.addMember("x", new Constant(String.valueOf(transform.scale.x))); + scaleTerm.addMember("y", new Constant(String.valueOf(transform.scale.y))); + scaleTerm.addMember("z", new Constant(String.valueOf(transform.scale.z))); JsonTerm transformTerm = new JsonTerm(); transformTerm.addMember("position", positionTerm); @@ -372,6 +418,33 @@ return transformTerm; } + public JsonTerm createEnemyJsonTerm(Entity entity){ + + EditorEntity editorEntity = (EditorEntity) entity; + + JsonTerm moveTerm = new JsonTerm(); + JsonTerm meshTerm = new JsonTerm(); + JsonTerm enemyTerm = new JsonTerm(); + + enemyTerm.addMember("transform", createTransformTerm(entity.transform)); + enemyTerm.addMember("eid", new Constant(entity.getId(), DataConstraintModel.typeString)); + + for(EditorEntity.Connectiontype connectionType: editorEntity.ComponentConnections) { + if (connectionType == EditorEntity.Connectiontype.Mesh) { + meshTerm.addMember("type", new Constant("sprite", DataConstraintModel.typeString)); + meshTerm.addMember("sprite", new Constant(Window.resourcePath + "enemy1.png", DataConstraintModel.typeString)); + enemyTerm.addMember("mesh", meshTerm); + } + if (connectionType == EditorEntity.Connectiontype.Move) { + moveTerm.addMember("type", new Constant("straight")); + moveTerm.addMember("speed", new Constant(String.valueOf(5.0))); + enemyTerm.addMember("move", moveTerm); + } + } + return enemyTerm; + } + + public JsonTerm createPlayerJsonTerm(){ JsonTerm meshTerm = new JsonTerm(); @@ -379,52 +452,14 @@ meshTerm.addMember("sprite", new Constant(Window.resourcePath + "enemy1.png", DataConstraintModel.typeString)); JsonTerm playerTerm = new JsonTerm(); - playerTerm.addMember("transform", createTransformTerm()); + playerTerm.addMember("transform", createTransformTerm(new Transform())); playerTerm.addMember("mesh", meshTerm); return playerTerm; } - - public JsonTerm createEnemyJsonTerm(){ - - JsonTerm moveTerm = new JsonTerm(); - moveTerm.addMember("type", new Constant("straight")); - moveTerm.addMember("speed", new Constant(String.valueOf(5.0))); - - JsonTerm meshTerm = new JsonTerm(); - meshTerm.addMember("type", new Constant("sprite", DataConstraintModel.typeString)); - meshTerm.addMember("sprite", new Constant(Window.resourcePath + "enemy1.png", DataConstraintModel.typeString)); - - JsonTerm enemyTerm = new JsonTerm(); - enemyTerm.addMember("transform", createTransformTerm()); - enemyTerm.addMember("mesh", meshTerm); - enemyTerm.addMember("move", moveTerm); - - JsonTerm enemiesTerm = new JsonTerm(); - enemiesTerm.addMember("001", enemyTerm); - enemiesTerm.addMember("002", enemyTerm); - - return enemiesTerm; - } - - public JsonTerm createTimrsJsonTerm(){ - - JsonTerm timerTerm = new JsonTerm(); - timerTerm.addMember("interval", new Constant(String.valueOf(100))); - timerTerm.addMember("count", new Constant(String.valueOf(0))); - - JsonTerm timersTerm = new JsonTerm(); - timersTerm.addMember("000",timerTerm); - return timersTerm; - } - - private void addInit(){ - ResourceHierarchy timersHierarchy = new ResourceHierarchy("timers", DataConstraintModel.typeJson); - timersHierarchy = model.getOrPutResourceHierarchy(timersHierarchy); - JsonTerm timersRightTerm = createTimrsJsonTerm(); - timersHierarchy.setInitialValue(timersRightTerm); - timersHierarchy.setInitText(timersRightTerm.toString()); + private void addInit() { + EditorScene editorScene = (EditorScene) Window.get().getScene(); ResourceHierarchy playerHierarchy = new ResourceHierarchy("player", DataConstraintModel.typeJson); playerHierarchy = model.getOrPutResourceHierarchy(playerHierarchy); @@ -432,11 +467,18 @@ playerHierarchy.setInitialValue(playerRightTerm); playerHierarchy.setInitText(playerRightTerm.toString()); - ResourceHierarchy enemyHierarchy = new ResourceHierarchy("enemy", DataConstraintModel.typeJson); - enemyHierarchy = model.getOrPutResourceHierarchy(enemyHierarchy); - JsonTerm enemyRightTerm = createEnemyJsonTerm(); - enemyHierarchy.setInitialValue(enemyRightTerm); - enemyHierarchy.setInitText(enemyRightTerm.toString()); + // 0番はカメラのため + for (int i = 1; i < editorScene.editorEntities.size(); i++) { + EditorEntity editorEntity = (EditorEntity) editorScene.getEditorEntity("" + i); + if(editorEntity.getEditorComponent(EntityView.class) != null) { + ResourceHierarchy enemyHierarchy = new ResourceHierarchy("enemy" + editorScene.getEditorEntity("" + i).getId(), DataConstraintModel.typeJson); + enemyHierarchy = model.getOrPutResourceHierarchy(enemyHierarchy); + JsonTerm enemyTerm = createEnemyJsonTerm(editorScene.getEditorEntity("" + i)); + enemyHierarchy.setInitialValue(enemyTerm); + enemyHierarchy.setInitText(enemyTerm.toString()); + } + } + } diff --git a/GameEngine/src/main/java/gameEngine/entites/EditorEntity.java b/GameEngine/src/main/java/gameEngine/entites/EditorEntity.java index 5f72f29..76a965b 100644 --- a/GameEngine/src/main/java/gameEngine/entites/EditorEntity.java +++ b/GameEngine/src/main/java/gameEngine/entites/EditorEntity.java @@ -1,15 +1,13 @@ package gameEngine.entites; -import gameEngine.entites.editorComponents.ComponentView; import gameEngine.entites.editorComponents.EditorComponent; -import gameEngine.entites.editorComponents.PortView; import java.util.ArrayList; import java.util.List; public class EditorEntity extends Entity { public final List editorComponents = new ArrayList<>(); - public enum Connectiontype {Mesh, MoveImage, MoveStraight} + public enum Connectiontype {Mesh, MoveImage, Move} public List ComponentConnections = new ArrayList<>(); public EditorEntity(String eid) { diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java index b27dc64..44aee06 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java @@ -128,7 +128,7 @@ private void addMoveStraightComponentView(){ EditorEntity object = createObject(); - object.addEditorComponent(new ComponentView(object, EditorEntity.Connectiontype.MoveStraight, "MoveStraight")); + object.addEditorComponent(new ComponentView(object, EditorEntity.Connectiontype.Move, "MoveStraight")); } ///---------------------------------------------------------------- diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java index c5c18d4..5a935cd 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -69,7 +69,7 @@ if(connectionType == EditorEntity.Connectiontype.MoveImage){ object.addComponent(new MoveImage(object)); } - if(connectionType == EditorEntity.Connectiontype.MoveStraight){ + if(connectionType == EditorEntity.Connectiontype.Move){ object.addComponent(new Move(object)); } } diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index 3067dc8..06e9150 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -51,6 +51,9 @@ } else currentScene = new GameScene(); break; + case 2: //DTRAM Scene + currentScene = new GameScene(); + break; default: assert false : "Unknown Scene [" + newScene + "]"; break;