X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.g3d%2Fsrc%2Forg%2Fsimantics%2Fproconf%2Fg3d%2Fcommon%2FJmeComposite.java;h=bb9e0bbbceaf2bf6384112d23f85caca3fb2363b;hb=9ad91ae4a059a4c7b219d2560c5b8b8ed1c5f184;hp=5cff3ffb36502d71c8364dce8900ce82f1b7ebe0;hpb=477a3eae417fe71addfcf8f87dab41f87151a384;p=simantics%2F3d.git diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java index 5cff3ffb..bb9e0bbb 100644 --- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java +++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/common/JmeComposite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 VTT Technical Research Centre of Finland and others. + * Copyright (c) 2007- VTT Technical Research Centre of Finland. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,13 +17,15 @@ import org.eclipse.core.runtime.Path; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; +import org.eclipse.swt.events.PaintEvent; +import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.opengl.GLCanvas; import org.eclipse.swt.widgets.Composite; import org.simantics.proconf.g3d.base.JmeRenderingComponent; import org.simantics.proconf.g3d.base.ResourceTextureCache; -import org.simantics.utils.ErrorLogger; +import org.simantics.utils.ui.ErrorLogger; import com.jme.renderer.Renderer; import com.jme.renderer.lwjgl.LWJGLRenderer; @@ -55,6 +57,14 @@ public class JmeComposite extends Composite { } }); +// this.addPaintListener(new PaintListener() { +// @Override +// public void paintControl(PaintEvent e) { +// displaySystem.setCurrent(); +// JmeComposite.this.component.render(); +// } +// }); + } @@ -109,4 +119,6 @@ public class JmeComposite extends Composite { public DisplaySystem getDisplaySystem() { return displaySystem; } + + }