Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
This commit is contained in:
@@ -7,6 +7,7 @@ import javafx.scene.control.SplitPane;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Pane;
|
||||
import mock.app.Event;
|
||||
import mock.exceptions.EventConstructionException;
|
||||
import visualiser.model.View3D;
|
||||
@@ -49,6 +50,9 @@ public class HostController extends Controller {
|
||||
@FXML
|
||||
GridPane playerContainer;
|
||||
|
||||
@FXML
|
||||
private Pane playerPane;
|
||||
|
||||
private Event game;
|
||||
|
||||
private View3D fancyStuff;
|
||||
@@ -56,7 +60,8 @@ public class HostController extends Controller {
|
||||
@Override
|
||||
public void initialize(URL location, ResourceBundle resources) {
|
||||
fancyStuff = new View3D();
|
||||
playerContainer.add(fancyStuff, 0,0);
|
||||
playerPane.getChildren().add(fancyStuff);
|
||||
//playerContainer.add(fancyStuff, 0,0);
|
||||
fancyStuff.spinBox();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user