Fork: 0
nitta-lab-2018 / CactusServer

Instance #66

Merged n-fujimoto merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:Instance on 21 Jun 2018
Patch
Unified Split
Showing 4 changed files
View
1
■■■■■
 src/main/java/cactusServer/entities/Character.java
import java.util.List;
import java.util.Map;
 
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
//import org.ntlab.radishforandroidstudio.framework.model3D.Angle;
 
import cactusServer.models.Instances;
import cactusServer.utils.RandomStringGenerator;
import net.arnx.jsonic.JSONHint;
View
1
■■■■■
 src/main/java/cactusServer/entities/Instance.java
import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory;
import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException;
import org.ntlab.radishforandroidstudio.framework.model3D.Object3D;
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
//import org.ntlab.radishforandroidstudio.framework.model3D.Angle;
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;
View
1
■■■■■
 src/main/java/cactusServer/entities/Player.java
package cactusServer.entities;
 
import org.ntlab.radishforandroidstudio.framework.gameMain.Actor;
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
//import org.ntlab.radishforandroidstudio.framework.model3D.Angle;
 
import cactusServer.models.Instances;
import net.arnx.jsonic.JSONHint;
 
View
1
■■■■■
 src/main/java/cactusServer/models/Instances.java
import java.util.HashMap;
import java.util.List;
 
import org.ntlab.radishforandroidstudio.framework.model3D.Position3D;
//import org.ntlab.radishforandroidstudio.framework.model3D.Angle;
 
import cactusServer.entities.Angle;
import cactusServer.entities.CameraState;
import cactusServer.entities.EmoteState;