aramaki 

荒巻オンライン

Commit MetaInfo

Revisiond06bac4966750c7e267892498cc36f4b8b0da113 (tree)
Time2011-05-30 22:16:41
Authorsuperbacker <superbacker@user...>
Commitersuperbacker

Log Message

GWT DesignerでRendererのDeferred Bindingがうまくいかないのを対処
RendererのDeferred Binding条件を修正

Change Summary

Diff

--- a/src/net/scaltinof/aramaki/AramakiOnline.gwt.xml
+++ b/src/net/scaltinof/aramaki/AramakiOnline.gwt.xml
@@ -28,6 +28,10 @@
2828
2929 <replace-with class="net.scaltinof.aramaki.client.engine3d.renderer.nil.NullRenderer">
3030 <when-type-is class="net.scaltinof.aramaki.client.engine3d.core.Renderer"/>
31+ <any>
32+ <when-property-is name="canvas_supported" value="not_supported"/>
33+ <when-property-is name="canvas_supported" value="only2d"/>
34+ </any>
3135 </replace-with>
3236
3337 <replace-with class="net.scaltinof.aramaki.client.engine3d.renderer.webgl.WebGLRenderer">
--- a/src/net/scaltinof/aramaki/Canvas.gwt.xml
+++ b/src/net/scaltinof/aramaki/Canvas.gwt.xml
@@ -2,7 +2,6 @@
22 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.2.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.2.0/distro-source/core/src/gwt-module.dtd">
33 <module>
44 <define-property values="webgl,only2d,not_supported" name="canvas_supported"/>
5-
65 <property-provider name="canvas_supported"><![CDATA[
76 var canvas = document.createElement("canvas");
87
--- a/src/net/scaltinof/aramaki/client/AramakiOnline.java
+++ b/src/net/scaltinof/aramaki/client/AramakiOnline.java
@@ -19,8 +19,14 @@
1919 package net.scaltinof.aramaki.client;
2020
2121 import com.google.gwt.core.client.EntryPoint;
22+import com.google.gwt.core.client.Scheduler;
23+import com.google.gwt.core.client.Scheduler.RepeatingCommand;
24+import com.google.gwt.dom.client.Style.Unit;
25+import com.google.gwt.event.logical.shared.ResizeEvent;
26+import com.google.gwt.event.logical.shared.ResizeHandler;
2227 import com.google.gwt.user.client.Window;
2328 import com.google.gwt.user.client.ui.RootLayoutPanel;
29+import com.google.gwt.user.client.ui.RootPanel;
2430
2531 /**
2632 * Entry point classes define <code>onModuleLoad()</code>.
@@ -29,7 +35,7 @@ public class AramakiOnline implements EntryPoint {
2935 public void onModuleLoad() {
3036 Window.setTitle("荒巻オンライン");
3137
32- ChatScreen chatScreen = new ChatScreen();
38+ final ChatScreen chatScreen = new ChatScreen();
3339 RootLayoutPanel.get().add(chatScreen);
3440 }
3541 }
--- a/src/net/scaltinof/aramaki/client/engine3d/core/Space3D.java
+++ b/src/net/scaltinof/aramaki/client/engine3d/core/Space3D.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
2222 import java.util.Collection;
2323
2424 import net.scaltinof.aramaki.client.engine3d.geom.Matrix4;
25+import net.scaltinof.aramaki.client.engine3d.renderer.nil.NullRenderer;
2526
2627 import com.google.gwt.core.client.GWT;
2728 import com.google.gwt.core.client.Scheduler;
@@ -39,12 +40,19 @@ public class Space3D extends Composite implements RequiresResize {
3940 public static final int MAX_RENDER_INTERVAL = 1000 / 30;
4041
4142 private final SimplePanel wrapper = new SimplePanel();
42- private final Renderer renderer = GWT.create(Renderer.class);
43+ private Renderer renderer;
4344 private final Collection<Object3D> objects = new ArrayList<Object3D>();
4445 private final Matrix4 spaceMatrix = new Matrix4();
4546 private Timer renderTimer;
4647
4748 public Space3D() {
49+ //FIXME GWT DesignerでRendererのDeferred Bindingがうまくいかない
50+ try {
51+ renderer = GWT.create(Renderer.class);
52+ } catch(RuntimeException e) {
53+ renderer = new NullRenderer();
54+ }
55+
4856 wrapper.add(renderer);
4957 initWidget(wrapper);
5058
--- a/war/AramakiOnline.html
+++ b/war/AramakiOnline.html
@@ -20,6 +20,7 @@
2020 <!-- -->
2121 <script language="javascript" src="net.scaltinof.aramaki.AramakiOnline/net.scaltinof.aramaki.AramakiOnline.nocache.js"></script>
2222
23+ <meta name="viewport" content="target-densitydpi=medium-dpi,width=device-width,height=device-height,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
2324 </head>
2425
2526 <!-- -->
旧リポジトリブラウザで表示