diff --git a/RadishFrameworkLight/src/fight3D/Fight.java b/RadishFrameworkLight/src/fight3D/Fight.java index f992208..9f10dd9 100644 --- a/RadishFrameworkLight/src/fight3D/Fight.java +++ b/RadishFrameworkLight/src/fight3D/Fight.java @@ -80,7 +80,7 @@ universe.placeAsAReceiver(stageGround); RWTCanvas3D c = (RWTCanvas3D) fightListener; s.setBackgroundSize(new Dimension(c.getWidth(), c.getHeight())); - universe.place(s.getBackground()); + universe.placeUnremovable(s.getBackground()); // �L�����N�^�̒lj��A����̒lj� for (int i = 0; i < selectedCharacterArray.length; i++) { diff --git a/RadishFrameworkLight/src/fight3D/Player.java b/RadishFrameworkLight/src/fight3D/Player.java index 4f02a65..3be6203 100644 --- a/RadishFrameworkLight/src/fight3D/Player.java +++ b/RadishFrameworkLight/src/fight3D/Player.java @@ -98,13 +98,13 @@ universe.placeAsAnOcculuder(this); // �e�̕\���̏��� if (!character.hasAttackingPart()) { - universe.place((Weapon) normalAttack); + universe.placeUnremovable((Weapon) normalAttack); } if (!character.hasUpperAttackingPart()) { - universe.place((Weapon) upperAttack); + universe.placeUnremovable((Weapon) upperAttack); } if (!character.hasJumpAttackingPart()) { - universe.place((Weapon) jumpAttack); + universe.placeUnremovable((Weapon) jumpAttack); } // �K�[�h�\���̏��� @@ -125,7 +125,7 @@ guardScale.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE); guardPos.addChild(guardScale); guardScale.addChild(guardSphere); - universe.place(guardPos); + universe.placeUnremovable(guardPos); setGuardInvisible(); } diff --git a/RadishFrameworkLight/src/framework/model3D/Universe.java b/RadishFrameworkLight/src/framework/model3D/Universe.java index e52c392..267dad8 100644 --- a/RadishFrameworkLight/src/framework/model3D/Universe.java +++ b/RadishFrameworkLight/src/framework/model3D/Universe.java @@ -88,7 +88,7 @@ * �I�u�W�F�N�g��z�u���� * @param obj �z�u����I�u�W�F�N�g */ - public void place(Node obj) { + public void placeUnremovable(Node obj) { if (!root.isCompiled()) { root.addChild(obj); } else { @@ -100,12 +100,12 @@ * �I�u�W�F�N�g��z�u���� * @param obj �z�u����I�u�W�F�N�g */ - public void place(Placeable obj) { + public void placeUnremovable(Placeable obj) { BaseObject3D body = obj.getBody(); if (body.isReflectionMappingApplied() || body.isBumpMappingApplied()) { extraObjects.add(body); } else { - place(obj.getTransformGroupToPlace()); + placeUnremovable(obj.getTransformGroupToPlace()); } } @@ -113,7 +113,7 @@ * ��Ŏ�菜����悤�ɃI�u�W�F�N�g��z�u���� * @param obj �z�u����I�u�W�F�N�g */ - public void placeDisplacable(Node obj) { + public void place(Node obj) { BranchGroup objRoot; if (obj.getParent() != null && obj.getParent() instanceof BranchGroup) { @@ -130,12 +130,12 @@ * ��Ŏ�菜����悤�ɃI�u�W�F�N�g��z�u���� * @param obj �z�u����I�u�W�F�N�g */ - public void placeDisplacable(Placeable obj) { + public void place(Placeable obj) { BaseObject3D body = obj.getBody(); if (body != null && (body.isReflectionMappingApplied() || body.isBumpMappingApplied())) { extraObjects.add(body); } else { - placeDisplacable(obj.getTransformGroupToPlace()); + place(obj.getTransformGroupToPlace()); } } @@ -148,7 +148,7 @@ if (body instanceof Object3D) { addShadowOcculuder((Object3D)body); } else { - place(obj); + placeUnremovable(obj); } } diff --git a/RadishFrameworkLight/src/framework/test/TestAnimation.java b/RadishFrameworkLight/src/framework/test/TestAnimation.java index 30b8627..b4d23b9 100644 --- a/RadishFrameworkLight/src/framework/test/TestAnimation.java +++ b/RadishFrameworkLight/src/framework/test/TestAnimation.java @@ -142,7 +142,7 @@ light.setInfluencingBounds(new BoundingSphere(new Point3d(), 500.0)); universe.placeLight(light); - universe.place(obj); + universe.placeUnremovable(obj); universe.compile(); frame.setSize(720, 480); diff --git a/RadishFrameworkLight/src/framework/test/TestBrick.java b/RadishFrameworkLight/src/framework/test/TestBrick.java index 09a591a..83768d3 100644 --- a/RadishFrameworkLight/src/framework/test/TestBrick.java +++ b/RadishFrameworkLight/src/framework/test/TestBrick.java @@ -123,7 +123,7 @@ //// Quaternion3D q = new Quaternion3D(0.0, 0, 1.0, 0.7); //// solid.apply(q, false); // solid.apply(new AngularVelocity3D(-0.1, 0.0, -0.2), false); - universe.place(solid); + universe.placeUnremovable(solid); camera.addTarget(solid); @@ -132,7 +132,7 @@ } } - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �\�� universe.compile(); diff --git a/RadishFrameworkLight/src/framework/test/TestDice.java b/RadishFrameworkLight/src/framework/test/TestDice.java index 504eeed..7a852b6 100644 --- a/RadishFrameworkLight/src/framework/test/TestDice.java +++ b/RadishFrameworkLight/src/framework/test/TestDice.java @@ -123,7 +123,7 @@ // Quaternion3D q = new Quaternion3D(0.0, 0, 1.0, 0.7); // solid.apply(q, false); solid.apply(new AngularVelocity3D(-0.2, 0.0, -0.4), false); - universe.place(solid); + universe.placeUnremovable(solid); camera.addTarget(solid); @@ -132,7 +132,7 @@ } } - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �\�� universe.compile(); diff --git a/RadishFrameworkLight/src/framework/test/TestDomino.java b/RadishFrameworkLight/src/framework/test/TestDomino.java index 8a84c18..7cf95c9 100644 --- a/RadishFrameworkLight/src/framework/test/TestDomino.java +++ b/RadishFrameworkLight/src/framework/test/TestDomino.java @@ -78,15 +78,15 @@ solid9.scale(0.2, 2.0, 1.0); solid2.apply(new AngularVelocity3D(0.0, 0.0, 1.0), false); - universe.place(solid); - universe.place(solid2); - universe.place(solid3); - universe.place(solid4); - universe.place(solid5); - universe.place(solid6); - universe.place(solid7); - universe.place(solid8); - universe.place(solid9); + universe.placeUnremovable(solid); + universe.placeUnremovable(solid2); + universe.placeUnremovable(solid3); + universe.placeUnremovable(solid4); + universe.placeUnremovable(solid5); + universe.placeUnremovable(solid6); + universe.placeUnremovable(solid7); + universe.placeUnremovable(solid8); + universe.placeUnremovable(solid9); // ���C�g�̐ݒ� DirectionalLight light = new DirectionalLight(true, new Color3f(1.0f, @@ -101,7 +101,7 @@ // Object3D stageObject = ModelFactory.loadModel("data\\floor4.3ds").createObject(); Object3D stageObject = ModelFactory.loadModel("data\\stage3\\stage3.wrl").createObject(); Ground stageGround = new Ground(stageObject); - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �J�����̐ݒ� Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestMathmatics.java b/RadishFrameworkLight/src/framework/test/TestMathmatics.java index b582489..8bd0150 100644 --- a/RadishFrameworkLight/src/framework/test/TestMathmatics.java +++ b/RadishFrameworkLight/src/framework/test/TestMathmatics.java @@ -45,15 +45,15 @@ DirectionalLight light = new DirectionalLight(true, new Color3f(1.0f, 1.0f, 1.0f), new Vector3f(0.0f, 0.0f, -1.0f)); light.setInfluencingBounds(new BoundingSphere(new Point3d(), 500.0)); - universe.place(light); + universe.placeUnremovable(light); // obj1.setPosition(new Position3D(3.0,0.0,0.0)); // obj2.setPosition(new Position3D(-3.0,0.0,0.0)); Solid3D sol1 = new Solid3D(obj1); Solid3D sol2 = new Solid3D(obj2); sol1.apply(new Position3D(1.5, 1.5, 0.0), false); - universe.place(sol1); - universe.place(sol2); + universe.placeUnremovable(sol1); + universe.placeUnremovable(sol2); Camera3D camera = new Camera3D(universe); camera.setViewPoint(new Position3D(0.0, 0.0, 10.0)); diff --git a/RadishFrameworkLight/src/framework/test/TestMathmatics2.java b/RadishFrameworkLight/src/framework/test/TestMathmatics2.java index d255428..abb1b2f 100644 --- a/RadishFrameworkLight/src/framework/test/TestMathmatics2.java +++ b/RadishFrameworkLight/src/framework/test/TestMathmatics2.java @@ -59,7 +59,7 @@ DirectionalLight light = new DirectionalLight(true, new Color3f(1.0f, 1.0f, 1.0f), new Vector3f(0.0f, 0.0f, -1.0f)); light.setInfluencingBounds(new BoundingSphere(new Point3d(), 500.0)); - universe.place(light); + universe.placeUnremovable(light); // obj1.setPosition(new Position3D(3.0,0.0,0.0)); // obj2.setPosition(new Position3D(-3.0,0.0,0.0)); @@ -69,8 +69,8 @@ sol1.apply(new Position3D(-2.0, 0.0, 0.0), false); sol2.apply(new Position3D(0.0, 0.0, 0.0), false); stageGround = new Ground(sol2); - universe.place(sol1); - universe.place(stageGround); + universe.placeUnremovable(sol1); + universe.placeUnremovable(stageGround); Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestModel.java b/RadishFrameworkLight/src/framework/test/TestModel.java index ed10dbb..d726582 100644 --- a/RadishFrameworkLight/src/framework/test/TestModel.java +++ b/RadishFrameworkLight/src/framework/test/TestModel.java @@ -78,10 +78,10 @@ new Color3f(1.0f, 1.0f, 1.0f), new Vector3f(0.0f, 0.0f, -1.0f)); light.setInfluencingBounds(new BoundingSphere(new Point3d(), 500.0)); - universe.place(light); + universe.placeUnremovable(light); // SimpleUniverse universe = new SimpleUniverse(testModel.c); - universe.place(obj); + universe.placeUnremovable(obj); universe.compile(); Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestMultiView.java b/RadishFrameworkLight/src/framework/test/TestMultiView.java index 6e7babb..0b3d6f7 100644 --- a/RadishFrameworkLight/src/framework/test/TestMultiView.java +++ b/RadishFrameworkLight/src/framework/test/TestMultiView.java @@ -58,12 +58,12 @@ Object3D pochaBody1 = pochaModel.createObject(); pocha1 = new OvergroundActor(pochaBody1, pochaAnimation); pocha1.body.apply(new Position3D(3.0, 0.0, 0.0), false); - universe.place(pocha1); + universe.placeUnremovable(pocha1); Object3D pochaBody2 = pochaModel.createObject(); pocha2 = new OvergroundActor(pochaBody2, pochaAnimation); pocha2.body.apply(new Position3D(-3.0, 0.0, 0.0), false); - universe.place(pocha2); + universe.placeUnremovable(pocha2); camera1.setViewPoint(pocha1.getPosition().add(0.0, 0.5, 0.0)); camera1.addTarget(pocha1); @@ -75,7 +75,7 @@ Object3D stageObj = ModelFactory.loadModel("data\\stage3\\stage3.wrl").createObject(); stage = new Ground(stageObj); - universe.place(stage); + universe.placeUnremovable(stage); } @Override diff --git a/RadishFrameworkLight/src/framework/test/TestObject.java b/RadishFrameworkLight/src/framework/test/TestObject.java index 1ba9be2..19be087 100644 --- a/RadishFrameworkLight/src/framework/test/TestObject.java +++ b/RadishFrameworkLight/src/framework/test/TestObject.java @@ -80,12 +80,12 @@ ap2.setColoringAttributes(new ColoringAttributes(0.5f, 0.5f, 0.5f, ColoringAttributes.NICEST)); BaseObject3D stageObject = new BaseObject3D(groundGeometry, ap2); Ground stageGround = new Ground(stageObject); - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �I�u�W�F�N�g�̐ݒ� Model3D model = ModelFactory.loadModel("data\\cubeBlue.3ds"); // 3D���f���t�@�C���̓ǂݍ��� object = model.createObject(); // �I�u�W�F�N�g��1���� - universe.place(object); // ���E�ɔz�u + universe.placeUnremovable(object); // ���E�ɔz�u // �J�����̐ݒ� Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestPhysics.java b/RadishFrameworkLight/src/framework/test/TestPhysics.java index e51a020..3636455 100644 --- a/RadishFrameworkLight/src/framework/test/TestPhysics.java +++ b/RadishFrameworkLight/src/framework/test/TestPhysics.java @@ -52,7 +52,7 @@ light.setInfluencingBounds(new BoundingSphere(new Point3d(), 500.0)); universe.placeLight(light); - universe.place(obj); + universe.placeUnremovable(obj); frame.setSize(720, 480); frame.setVisible(true); @@ -60,11 +60,11 @@ // �v���C���[�̐ݒ� Character c = CharacterManager.getInstance().getCharacter(0); Player p = new Player(c); - universe.place(p); + universe.placeUnremovable(p); // ��ѓ���̐ݒ� Weapon w = new Weapon(c.getWeaponModel(), p, 0); - universe.place(w); + universe.placeUnremovable(w); w.body.apply(new Velocity3D(-5.0, 0.0, 0.0), false); w.body.apply(new Quaternion3D(), false); @@ -72,7 +72,7 @@ Stage stage = StageManager.getInstance().getStage(0); Object3D stageObject = stage.getModel().createObject(); Ground stageGround = new Ground(stageObject); - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �J�����̐ݒ� Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestPhysics2.java b/RadishFrameworkLight/src/framework/test/TestPhysics2.java index 02fc3ab..e3b801f 100644 --- a/RadishFrameworkLight/src/framework/test/TestPhysics2.java +++ b/RadishFrameworkLight/src/framework/test/TestPhysics2.java @@ -52,8 +52,8 @@ solid.apply(new Position3D(0.0, 0.0, 0.0), false); Solid3D solid2 = new Solid3D(obj2); solid2.apply(new Position3D(0.7, 4.0, 0.0), false); - universe.place(solid); - universe.place(solid2); + universe.placeUnremovable(solid); + universe.placeUnremovable(solid2); // ���C�g�̐ݒ� DirectionalLight light = new DirectionalLight(true, new Color3f(1.0f, @@ -67,7 +67,7 @@ // �X�e�[�W�̐ݒ� Object3D stageObject = ModelFactory.loadModel("data//floor4.3ds").createObject(); Ground stageGround = new Ground(stageObject); - universe.place(stageGround); + universe.placeUnremovable(stageGround); // �J�����̐ݒ� Camera3D camera = new Camera3D(universe); diff --git a/RadishFrameworkLight/src/framework/test/TestShadow.java b/RadishFrameworkLight/src/framework/test/TestShadow.java index 64eedac..8f34142 100644 --- a/RadishFrameworkLight/src/framework/test/TestShadow.java +++ b/RadishFrameworkLight/src/framework/test/TestShadow.java @@ -86,7 +86,7 @@ quadArray0.setNormal(2, new Vector3f(0.0f, 1.0f, 0.0f)); quadArray0.setNormal(3, new Vector3f(0.0f, 1.0f, 0.0f)); Shape3D box0 = new Shape3D(quadArray0, ap0); - universe.place(box0); + universe.placeUnremovable(box0); // �V���h�E�{�����[���\�ʁi�X�e���V���o�b�t�@��+1�j Appearance ap1 = new Appearance(); @@ -112,7 +112,7 @@ ta1.setTransparency(1.0f); ap1.setTransparencyAttributes(ta1); Cylinder cyl1 = new Cylinder(1.0f, 10.0f, ap1); - universe.place(cyl1); + universe.placeUnremovable(cyl1); // �V���h�E�{�����[�����ʁi�X�e���V���o�b�t�@��-1�j Appearance ap2 = new Appearance(); @@ -138,7 +138,7 @@ ta2.setTransparency(1.0f); ap2.setTransparencyAttributes(ta2); Cylinder cyl2 = new Cylinder(1.0f, 10.0f, ap2); - universe.place(cyl2); + universe.placeUnremovable(cyl2); // �e�̕������������n�� Appearance ap3 = new Appearance(); @@ -166,7 +166,7 @@ new Point3d(10.0, 0.0, 10.0), new Point3d(10.0, 0.0, -10.0)}); Shape3D box1 = new Shape3D(quadArray1, ap3); - universe.place(box1); + universe.placeUnremovable(box1); frame.setSize(720, 480); frame.setVisible(true); diff --git a/RadishFrameworkLight/src/framework/view3D/Camera3D.java b/RadishFrameworkLight/src/framework/view3D/Camera3D.java index 3eb68d3..b844e20 100644 --- a/RadishFrameworkLight/src/framework/view3D/Camera3D.java +++ b/RadishFrameworkLight/src/framework/view3D/Camera3D.java @@ -62,7 +62,7 @@ viewPlatformTransform.setCapability(TransformGroup.ALLOW_TRANSFORM_READ); viewPlatformTransform.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE); viewPlatformTransform.addChild(viewPlatform); - universe.place(viewPlatformTransform); + universe.placeUnremovable(viewPlatformTransform); } public Universe getUniverse() { diff --git a/RadishFrameworkLight/src/sample/SampleGame.java b/RadishFrameworkLight/src/sample/SampleGame.java index 0bafb78..0d89276 100644 --- a/RadishFrameworkLight/src/sample/SampleGame.java +++ b/RadishFrameworkLight/src/sample/SampleGame.java @@ -41,11 +41,11 @@ Animation3D pochaAnimation = AnimationFactory.loadAnimation("data\\pocha\\walk.wrl"); pocha = new OvergroundActor(pochaBody, pochaAnimation); pocha.setPosition(new Position3D(3.87, 0.0, 24.0)); - universe.place(pocha); + universe.placeUnremovable(pocha); Object3D stageObj = ModelFactory.loadModel("data\\konan\\konan3.wrl").createObject(); stage = new Ground(stageObj); - universe.place(stage); + universe.placeUnremovable(stage); camera.setViewPoint(pocha.getPosition().add(0.0, 1.5, 0.0)); camera.setViewLine(pocha.getDirection()); diff --git a/RadishFrameworkLight/src/template/RPG/TemplateScenarioGame.java b/RadishFrameworkLight/src/template/RPG/TemplateScenarioGame.java index d26bad8..6bb3d92 100644 --- a/RadishFrameworkLight/src/template/RPG/TemplateScenarioGame.java +++ b/RadishFrameworkLight/src/template/RPG/TemplateScenarioGame.java @@ -72,17 +72,17 @@ Animation3D pochaAnimation = AnimationFactory.loadAnimation("data\\pocha\\walk.wrl"); player = new Player(pochaBody, pochaAnimation); player.setPosition(new Position3D(-77.68, 0.0, -1.9)); - universe.place(player); + universe.placeUnremovable(player); // ���l��z�u�i�L�����N�^�[�͗��p�j king = new Player(pochaBody, pochaAnimation); king.setPosition(new Position3D(3.87, -11.92, 21.39)); - universe.place(king); + universe.placeUnremovable(king); // �X�e�[�W��3D�f�[�^��ǂݍ��ݔz�u���� Object3D stageObj = ModelFactory.loadModel("data\\konan\\konan3.wrl").createObject(); stage = new Ground(stageObj); - universe.place(stage); + universe.placeUnremovable(stage); // �J�����̐ݒ�i���Վ��_�ɂ���j camera.addTarget(player); @@ -114,7 +114,7 @@ Object3D enemy = ModelFactory.loadModel("data\\pocha\\pocha.wrl").createObject(); enemy.apply(new Position3D(0.0, 0.0, 0.0), false); enemy.apply(new Quaternion3D(0.0, 1.0, 0.0, Math.PI / 2.0), false); - universe.place(enemy); + universe.placeUnremovable(enemy); // �J�����̐ݒ�i�����_�ɂ���j camera.addTarget(enemy.getPosition3D().add(0.0, 1.0, 0.0)); diff --git a/RadishFrameworkLight/src/template/racing/TemplateRacing.java b/RadishFrameworkLight/src/template/racing/TemplateRacing.java index 533970e..7f40b02 100644 --- a/RadishFrameworkLight/src/template/racing/TemplateRacing.java +++ b/RadishFrameworkLight/src/template/racing/TemplateRacing.java @@ -74,12 +74,12 @@ Object3D carBody1 = carModel.createObject(); car1 = new Automobile(new Solid3D(carBody1), null); car1.body.apply(new Position3D(200.0, 3.0, 50.0), false); - universe.place(car1); + universe.placeUnremovable(car1); Object3D carBody2 = carModel.createObject(); car2 = new Automobile(new Solid3D(carBody2), null); car2.body.apply(new Position3D(-150.0, 3.0, 50.0), false); - universe.place(car2); + universe.placeUnremovable(car2); camera1.addTarget(car1); camera1.setViewLine(car1.getDirection()); @@ -94,7 +94,7 @@ Object3D stageObj = ModelFactory.loadModel("data\\Road\\RoadStage.WRL").createObject(); ground = new Ground(stageObj); - universe.place(ground); + universe.placeUnremovable(ground); buildSkyBox(universe); } diff --git a/RadishFrameworkLight/src/template/shooting/BattleField.java b/RadishFrameworkLight/src/template/shooting/BattleField.java index f17f390..f416474 100644 --- a/RadishFrameworkLight/src/template/shooting/BattleField.java +++ b/RadishFrameworkLight/src/template/shooting/BattleField.java @@ -64,7 +64,7 @@ * @param obj �z�u����I�u�W�F�N�g */ public void place(Node obj) { - universe.place(obj); + universe.placeUnremovable(obj); } /** @@ -86,7 +86,7 @@ geometryGraph = new GeometryGraph(v.getGeometry()); } } - universe.place(obj); + universe.placeUnremovable(obj); } /** @@ -94,7 +94,7 @@ * @param obj �z�u����I�u�W�F�N�g */ public void placeDisplacable(Node obj) { - universe.placeDisplacable(obj); + universe.place(obj); } /** @@ -102,7 +102,7 @@ * @param obj �z�u����I�u�W�F�N�g */ public void placeDisplacable(Placeable obj) { - universe.placeDisplacable(obj); + universe.place(obj); } /** @@ -110,7 +110,7 @@ * @param light �lj�������� */ public void placeLight(Light light) { - universe.place(light); + universe.placeUnremovable(light); } /** @@ -384,7 +384,7 @@ */ private void addEnemy(Enemy enemy) { enemies.add(enemy); - universe.placeDisplacable(enemy); + universe.place(enemy); } /** @@ -393,7 +393,7 @@ */ private void addPlayersBullet(PlayersBullet playersBullet) { playersBullets.add(playersBullet); - universe.placeDisplacable(playersBullet); + universe.place(playersBullet); } /** @@ -402,7 +402,7 @@ */ private void addEnemiesBullet(EnemiesBullet enemiesBullet) { enemiesBullets.add(enemiesBullet); - universe.placeDisplacable(enemiesBullet); + universe.place(enemiesBullet); } /**