diff --git a/app/src/main/java/com/google/ar/core/examples/java/common/framework/RWT/RWTRenderer.java b/app/src/main/java/com/google/ar/core/examples/java/common/framework/RWT/RWTRenderer.java index 8619fec..c6890bc 100644 --- a/app/src/main/java/com/google/ar/core/examples/java/common/framework/RWT/RWTRenderer.java +++ b/app/src/main/java/com/google/ar/core/examples/java/common/framework/RWT/RWTRenderer.java @@ -28,8 +28,9 @@ protected Universe universe; protected GraphicsContext3D gc3D = null; - public RWTRenderer(HelloArActivity helloArActivity, BackgroundRenderer backgroundRenderer) { + public RWTRenderer(HelloArActivity helloArActivity, BackgroundRenderer backgroundRenderer, Universe universe) { super(); + this.universe = universe; this.helloArActivity = helloArActivity; this.backgroundRenderer = backgroundRenderer; } @@ -51,7 +52,7 @@ @Override public void onSurfaceCreated(GL10 gl, EGLConfig config) { // gc3D = new GraphicsContext3D(gl); -// ArrayList lights = camera.getUniverse().getLights(); +// ArrayList lights = universe.getLights(); // for (int i = 0; i < lights.size(); i++){ // Light l = lights.get(i); // gc3D.setLight(l,i); @@ -100,10 +101,10 @@ viewer.setGraphicsContext3D(gc3D.setGL10(gl)); } viewer.onDrawFrame(); -// -// // 3Dモデルのレンダリング + + // 3Dモデルのレンダリング // gc3D.pushMatrix(); -// universe.render(viewer); + universe.render(viewer); // gc3D.popMatrix(); helloArActivity.onDrawFrame(gl, frame, camera); } catch (CameraNotAvailableException e) { diff --git a/app/src/main/java/com/google/ar/core/examples/java/common/framework/view3D/Viewer3D.java b/app/src/main/java/com/google/ar/core/examples/java/common/framework/view3D/Viewer3D.java index 414b09c..0fc7f64 100644 --- a/app/src/main/java/com/google/ar/core/examples/java/common/framework/view3D/Viewer3D.java +++ b/app/src/main/java/com/google/ar/core/examples/java/common/framework/view3D/Viewer3D.java @@ -45,7 +45,7 @@ // Position3D eye = camera.getViewPoint(); // Position3D center = eye.clone().add(camera.getViewLine()); // Vector3d up = camera.getViewUp(); - gc3D.update((float)camera.getFieldOfView(), (float)camera.getFrontClipDistance(), (float)camera.getBackClipDistance(), eye, center, up, camera.isParallel()); +// gc3D.update((float)camera.getFieldOfView(), (float)camera.getFrontClipDistance(), (float)camera.getBackClipDistance(), eye, center, up, camera.isParallel()); } @Override diff --git a/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java b/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java index 1d8b73e..b0f4efd 100644 --- a/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java +++ b/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java @@ -36,6 +36,7 @@ import com.google.ar.core.Trackable; import com.google.ar.core.TrackingState; import com.google.ar.core.examples.java.common.framework.RWT.RWTRenderer; +import com.google.ar.core.examples.java.common.framework.model3D.Universe; import com.google.ar.core.examples.java.common.helpers.CameraPermissionHelper; import com.google.ar.core.examples.java.common.helpers.DisplayRotationHelper; import com.google.ar.core.examples.java.common.helpers.FullScreenHelper; @@ -69,6 +70,7 @@ // Rendering. The Renderers are created here, and initialized when the GL surface is created. private GLSurfaceView surfaceView; private RWTRenderer renderer; + private Universe universe; private boolean installRequested; @@ -108,7 +110,8 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); surfaceView = findViewById(R.id.surfaceview); - renderer = new RWTRenderer(this, backgroundRenderer); + universe = new Universe(); + renderer = new RWTRenderer(this, backgroundRenderer, universe); // renderer.setBackgroundRenderer(backgroundRenderer); displayRotationHelper = new DisplayRotationHelper(/*context=*/ this); @@ -252,8 +255,6 @@ public void onSurfaceChanged(GL10 gl, int width, int height) { displayRotationHelper.onSurfaceChanged(width, height); GLES20.glViewport(0, 0, width, height); - -// renderer.onSurfaceChanged(gl, width, height); } public void onDrawFrame(GL10 gl, Frame frame, Camera camera) { @@ -341,7 +342,6 @@ virtualObject.draw(viewmtx, projmtx, colorCorrectionRgba, coloredAnchor.color); virtualObjectShadow.draw(viewmtx, projmtx, colorCorrectionRgba, coloredAnchor.color); -// renderer.onDrawFrame(gl); } } catch (Throwable t) {