[prev in list] [next in list] [prev in thread] [next in thread] 

List:       osflash-sandy
Subject:    [Sandy] [sandy commit] r1050 - Additional 3.1.1 changes imported to
From:       codesite-noreply () google ! com
Date:       2009-04-09 6:39:01
Message-ID: 0016368e20f6ee56280467198081 () google ! com
[Download RAW message or body]

Author: damonsbane
Date: Wed Apr  8 23:33:34 2009
New Revision: 1050

Modified:
    trunk/sandy/haxe/trunk/src/sandy/primitive/GeodesicSphere.hx
    trunk/sandy/haxe/trunk/tutos/dice_demo/Dice.hx
    trunk/sandy/haxe/trunk/tutos/panodemo/PanoDemo.hx

Log:
Additional 3.1.1 changes imported to trunk

Modified: trunk/sandy/haxe/trunk/src/sandy/primitive/GeodesicSphere.hx
==============================================================================
--- trunk/sandy/haxe/trunk/src/sandy/primitive/GeodesicSphere.hx	(original)
+++ trunk/sandy/haxe/trunk/src/sandy/primitive/GeodesicSphere.hx	Wed Apr  8  
23:33:34 2009
@@ -49,7 +49,7 @@
  	/**
  	* @private
  	*/
-	public function generate ( ?arguments:Array<Point3D> ):Geometry3D
+	public function generate<T> ( ?arguments:Array<T> ):Geometry3D
  	{
  		var l_oGeometry3D:Geometry3D = new Geometry3D();


Modified: trunk/sandy/haxe/trunk/tutos/dice_demo/Dice.hx
==============================================================================
--- trunk/sandy/haxe/trunk/tutos/dice_demo/Dice.hx	(original)
+++ trunk/sandy/haxe/trunk/tutos/dice_demo/Dice.hx	Wed Apr  8 23:33:34 2009
@@ -1,7 +1,7 @@
  //
  //  CubeLoader
  //
-//  Created by JLM at justinfront dot net and Guy Wheeler (  
milknosugar.co.uk )
+//  Created by JLM at justinfront dot net and Guy Wheeler (  
milknosugar.co.uk )
  //  6 October 2008
  //

@@ -23,27 +23,27 @@

  class Dice extends Sprite
  {
-
-
+
+
      private var scene:      Scene3D;
      private var camera:     Camera3D;
      private var cube:       Shape3D;
-
-
-
-    public function new ()
-    {
-
+
+
+
+    public function new ()
+    {
+
          super();
          loadCollada();
-
+
      }
-
-
+
+
      private function loadCollada()
      {
-
-        var parser: ColladaParser = Parser.create( "./dice.dae",  
Parser.COLLADA );
+
+        var parser: ColladaParser = Parser.create( "../assets/dice.dae",  
Parser.COLLADA );
  								parser.addEventListener( ParserEvent.FAIL, onError );
          parser.addEventListener( ParserEvent.INIT, create3d );
  								try {
@@ -51,51 +51,51 @@
  								} catch (e:Dynamic) {
  										trace(e);
  								}
-
+
      }
-
-
-    private function onError( pEvt: ParserEvent ) : Void
+
+
+    private function onError( pEvt: ParserEvent ) : Void
      {
-
+
          trace("|!! loading error !!!");
          trace("check you have the dice.jpg, dice.dae and dice.swf all in  
the same directory");
-
+
      }
-
-
+
+
      private function create3d( pEvt: ParserEvent ) : Void
      {
          camera = new Camera3D( 0, 0, -8);
          camera.viewport = new ViewPort( 400, 300 );
  								camera.lookAt(0,160,0);
  								camera.y = -160;
-
+
          var root:   Group = pEvt.group;
-
+
          cube = cast( root.children[ 0 ], Shape3D );
  								/*
  								cube.rotateX = 126;
  								cube.rotateY = 30;
  								cube.rotateY = 180;
  								*/
-
+
          cube.enableBackFaceCulling = true;
-
+
          // modify lighting of material here??
-
+
          scene = new Scene3D( "scene", this, camera, root );
-
+
  								Lib.current.stage.addEventListener( Event.ENTER_FRAME,  
enterFrameHandler );
          Lib.current.addChild( this );
-
+
      }
-
-
+
+
  				static var count : Int = 0;
      private function enterFrameHandler( ?event : Event ) : Void
      {
-
+
          scene.render();
  								cube.rotateY += 1;
  								/*
@@ -105,20 +105,20 @@

  								*/
  								//if ( ++count == 1000 ) trace( flash.Lib.getTimer() );
-
+
      }
-
-
-    static function main()
+
+
+    static function main()
      {
  #if js
  						haxe.Firebug.redirectTraces();
  				neash.Lib.Init("Container", 400, 400);
  				neash.Lib.Run();
  #end
-
+
          new Dice();
-
+
      }
-
+
  }

Modified: trunk/sandy/haxe/trunk/tutos/panodemo/PanoDemo.hx
==============================================================================
--- trunk/sandy/haxe/trunk/tutos/panodemo/PanoDemo.hx	(original)
+++ trunk/sandy/haxe/trunk/tutos/panodemo/PanoDemo.hx	Wed Apr  8 23:33:34  
2009
@@ -129,7 +129,7 @@
  		// --
  		for ( i in 0...6)
  		{
-			queue.add( planeNames[i], new  
URLRequest("assets/golden/"+planeNames[i]+".jpg") );
+			queue.add( planeNames[i], new  
URLRequest("../assets/golden/"+planeNames[i]+".jpg") );
  		}
  		// --
  		queue.addEventListener(SandyEvent.QUEUE_COMPLETE, loadComplete );

_______________________________________________
Sandy mailing list
Sandy@osflash.org
http://osflash.org/mailman/listinfo/sandy_osflash.org
[prev in list] [next in list] [prev in thread] [next in thread]