Fork: 0
nitta-lab-2018 / CactusServer

無間地獄に落ちるバグを修正 #164

Merged r-isitani merged 1 commit into nitta-lab-2018:master from nitta-lab-2018:obj on 14 Nov 2018
Patch
Unified Split
Showing 2 changed files
View
29
■■■■■
 src/main/java/cactusServer/entities/Instance.java
 
import java.util.HashMap;
import java.util.HashSet;
 
import org.ntlab.radishforandroidstudio.framework.model3D.BaseObject3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Object3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Universe;
import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D;
import org.ntlab.radishforandroidstudio.framework.physics.Ground;
import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D;
import org.ntlab.radishforandroidstudio.java3d.Appearance;
import org.ntlab.radishforandroidstudio.java3d.IndexedTriangleArray;
import org.ntlab.radishforandroidstudio.java3d.Material;
import org.ntlab.radishforandroidstudio.java3d.Point3d;
import org.ntlab.radishforandroidstudio.java3d.Vector3f;
 
import cactusServer.entities.Entity;
import cactusServer.entities.MovableObject;
import cactusServer.entities.Area.Allowed;
}
 
private void initUniverse() {
universe = new Universe();
/*
// ステージの3Dデータを読み込み配置する
Object3D stageObj = StageModelManager.getInstance().getStage(stageID).createObject();
stage = new Ground(stageObj);
universe.place(stage);
*/
IndexedTriangleArray groundGeometry = new IndexedTriangleArray(4,
IndexedTriangleArray.COORDINATES | IndexedTriangleArray.NORMALS, 6);
groundGeometry.setCoordinate(0, new Point3d(-20.0, -1.0, -20.0));
groundGeometry.setCoordinate(1, new Point3d(20.0, -1.0, -20.0));
groundGeometry.setCoordinate(2, new Point3d(20.0, -1.0, 20.0));
groundGeometry.setCoordinate(3, new Point3d(-20.0, -1.0, 20.0));
groundGeometry.setNormal(0, new Vector3f(0.0f, 1.0f, 0.0f));
groundGeometry.setNormal(1, new Vector3f(0.0f, 1.0f, 0.0f));
groundGeometry.setNormal(2, new Vector3f(0.0f, 1.0f, 0.0f));
groundGeometry.setNormal(3, new Vector3f(0.0f, 1.0f, 0.0f));
groundGeometry.setCoordinateIndices(0, new int[]{0, 3, 2});
groundGeometry.setCoordinateIndices(3, new int[]{0, 2, 1});
Appearance ap2 = new Appearance();
Material m2 = new Material();
m2.setDiffuseColor(0.5f, 1.0f, 0.2f);
ap2.setMaterial(m2);
Ground ground = new Ground(new BaseObject3D(groundGeometry, ap2));
universe.place(ground);
}
 
public String getName() {
return name;
View
11
■■■■■
 src/main/java/cactusServer/utils/App.java
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
 
import org.glassfish.jersey.server.ResourceConfig;
import org.ntlab.radishforandroidstudio.framework.model3D.BaseObject3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Model3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D;
import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D;
import org.ntlab.radishforandroidstudio.framework.physics.Ground;
import org.ntlab.radishforandroidstudio.framework.physics.PhysicsUtility;
import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D;
import org.ntlab.radishforandroidstudio.java3d.Appearance;
import org.ntlab.radishforandroidstudio.java3d.IndexedTriangleArray;
import org.ntlab.radishforandroidstudio.java3d.Material;
import org.ntlab.radishforandroidstudio.java3d.Point3d;
import org.ntlab.radishforandroidstudio.java3d.Vector3f;
 
import cactusServer.entities.*;
import cactusServer.entities.Character;
import cactusServer.entities.EmoteState.EmoteType;
private long lasttime = System.currentTimeMillis();
private boolean debugflag = false;
 
public App() {
int interval = (debugflag) ? 1000 : 1;
int interval = (debugflag) ? 1000 : 50;
ObjectModelManager.getInstance();
StageModelManager.getInstance();
CharacterModelManager.getInstance();
BulletModelManager.getInstance();
Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId5",
new Position3D(300, 400, 500), new Quaternion3D());
Instances.getInstance().getInstance("test1").createBullet("player1", "testBulletId6",
new Position3D(300, 400, 500), new Quaternion3D());
 
// // 確認用
// String player1Encode = JSON.encode(player1, true);
// String player2Encode = JSON.encode(player2, true);
// Player player1Decode = JSON.decode(player1Encode, Player.class);