0.3.3リリースに向けたコードの整理

Author: tueda

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 UEDA.Takashi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

build/android/Sample-01-simple/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -21,7 +21,7 @@ public class M3GRenderer implements Renderer {
 	private Graphics3D g3d;
 	private int        frame;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
 		// TODO Auto-generated method stub
 		if (frame++ % 100 == 0) {
@@ -30,7 +30,7 @@ public void onDrawFrame(GL10 gl) {
 		g3d.render(wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 		// TODO Auto-generated method stub
 		Log.println(Log.INFO, "M3GRenderer", "onSurfaceChanged");
@@ -39,7 +39,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
 		cam.setPerspective(45, width / (float) height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		// TODO Auto-generated method stub
 		Log.println(Log.INFO, "M3GRenderer", "onSurfaceCreated");

build/android/Sample-02-texture/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -25,23 +25,22 @@ public class M3GRenderer implements Renderer {
 	private World      wld;
 	private int        frame;
 
-	@Override
 	public void onDrawFrame(GL10 gl) {
 		if (frame++ % 100 == 0) {
 			Log.println(Log.INFO, "M3GRenderer", "onDrawFrame, i=" + frame);
 		}
 		g3d.render(wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 		Log.println(Log.INFO, "M3GRenderer", "onSurfaceChanged");
 		g3d.setViewport(0, 0, width, height);
 		Camera cam = wld.getActiveCamera();
 		cam.setPerspective(45, width / (float) height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		Log.println(Log.INFO, "M3GRenderer", "onSurfaceCreated");
 		g3d = Graphics3D.getInstance();

build/android/Sample-03-light/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -20,19 +20,16 @@ public class M3GRenderer implements Renderer {
 	private Graphics3D g3d;
 	private World      wld;
 
-	@Override
 	public void onDrawFrame(GL10 gl) {
 	      g3d.render (wld);
 	}
 
-	@Override
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 		g3d.setViewport (0, 0, width, height);
 		Camera cam = wld.getActiveCamera ();
 		cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         g3d = Graphics3D.getInstance ();
         wld = new World ();

build/android/Sample-04-vertex-color/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -20,19 +20,16 @@ public class M3GRenderer implements Renderer {
     private Graphics3D     g3d;
     private World          wld;
 
-	@Override
 	public void onDrawFrame(GL10 gl) {
         g3d.render (wld);
 	}
 
-	@Override
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
         g3d.setViewport (0, 0, width, height);
         Camera cam = wld.getActiveCamera ();
         cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         g3d    = Graphics3D.getInstance ();
         wld    = new World ();

build/android/Sample-05-fog/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -24,19 +24,19 @@ public class M3GRenderer implements Renderer {
     private Graphics3D     g3d;
     private World          wld;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
         g3d.render (wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
         g3d.setViewport (0, 0, width, height);
         Camera cam = wld.getActiveCamera ();
         cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         this.g3d    = Graphics3D.getInstance ();
         this.wld    = new World ();

build/android/Sample-06-compositing-mode/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -25,21 +25,21 @@ public class M3GRenderer implements Renderer {
     private Graphics3D     g3d;
     private World          wld;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
 		// TODO Auto-generated method stub
 	       g3d.render (wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 		// TODO Auto-generated method stub
         g3d.setViewport (0, 0, width, height);
         Camera cam = wld.getActiveCamera ();
         cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         g3d    = Graphics3D.getInstance ();
         wld    = new World ();

build/android/Sample-07-sprite/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -21,19 +21,19 @@ public class M3GRenderer implements Renderer {
     private Graphics3D     g3d;
     private World          wld;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
         g3d.render (wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 	       g3d.setViewport (0, 0, width, height);
 	        Camera cam = wld.getActiveCamera ();
 	        cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		    g3d    = Graphics3D.getInstance ();
 	        wld    = new World ();

build/android/Sample-08-skinned-mesh/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -24,21 +24,21 @@ public class M3GRenderer implements Renderer {
     private World          wld;
     private int            worldTime;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
 		worldTime += 10;
 		wld.animate (worldTime);
         g3d.render (wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
         g3d.setViewport (0, 0, width, height);
         Camera cam = wld.getActiveCamera ();
         cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         g3d    = Graphics3D.getInstance ();
         wld    = new World ();

build/android/Sample-09-mophing-mesh/src/org/karlsland/m3g/sample/M3GRenderer.java

@@ -22,21 +22,21 @@ public class M3GRenderer implements Renderer {
     private World          wld;
     private int            worldTime;
 
-	@Override
+
 	public void onDrawFrame(GL10 gl) {
 		worldTime += 10;
         wld.animate (worldTime);
         g3d.render (wld);
 	}
 
-	@Override
+
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
         g3d.setViewport (0, 0, width, height);
         Camera cam = wld.getActiveCamera ();
         cam.setPerspective (45, width/(float)height, 0.1f, 100.f);
 	}
 
-	@Override
+
 	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
 		g3d = Graphics3D.getInstance();
 		wld    = new World ();