Permalink
Browse files

fixed up templates for rc 2.8.548

  • Loading branch information...
hypersurge committed Nov 10, 2018
1 parent 03a60e0 commit a9b8bfd659817d2303d27322231d236c6bc91cc9
@@ -1,5 +1,5 @@
haxelib build list:
Copy contents of /assets/templates/flashDevelop to a zip and replace /lib/__resources/template.zip
Copy contents of /assets/templates/flashDevelop to a zip and replace /lib/__resources/templates.zip
Run /assets/build/compileRun.hxml (to generate /lib/run.n)
Run /app/compileHaxedoc.hxml (to generate /lib/haxedoc.xml)
Update /lib/haxelib.json with relevant version and comments (increment minor version, and set revision to number of commits+1 as seen on https://github.com/hypersurge/awe6
@@ -3,7 +3,7 @@ import awe6.core.AAssetManager;
import awe6.core.Context;
import awe6.core.View;
import awe6.interfaces.IView;
import createjs.easeljs.Bitmap;
import pixi.core.sprites.Sprite;
/**
$(CBI)* ...
@@ -53,8 +53,8 @@ class AssetManager extends AAssetManager $(CSLB){
case OVERLAY_UNPAUSE_UP : Assets.overlay_buttons_UnpauseUp__png;
case OVERLAY_UNPAUSE_OVER : Assets.overlay_buttons_UnpauseOver__png;
}
var l_bitmap:Bitmap = new Bitmap( getAsset( l_url ) );
l_context.addChild( l_bitmap );
var l_sprite = new Sprite( _kernel.assets.getAsset( l_url ).texture );
l_context.addChild( l_sprite );
return new View( _kernel, l_context );
}
@@ -1,28 +1,26 @@
package $(PackageName);
import awe6.core.APreloader;
import awe6.core.drivers.createjs.extras.gui.Text;
import awe6.core.drivers.pixijs.extras.gui.Text;
import awe6.interfaces.ETextStyle;
import createjs.easeljs.Shape;
import pixi.core.graphics.Graphics;
/**
$(CBI)* ...
$(CBI)* @author $(DefaultUser)
$(CBI)*/
class Preloader extends APreloader $(CSLB){
private var _bg:Shape;
private var _fg:Shape;
private var _bg:Graphics;
private var _fg:Graphics;
override private function _init():Void $(CSLB){
super._init();
_bg = new Shape();
_bg.graphics.beginFill( "#202020" );
_bg.graphics.drawRect( -1, -1, 102, 12 );
_bg.graphics.endFill();
_fg = new Shape();
_fg.graphics.beginFill( "#cccccc" );
_fg.graphics.drawRect( 0, 0, 100, 10 );
_fg.graphics.endFill();
_bg = new Graphics();
_bg.beginFill( 0x202020 );
_bg.drawRect( -1, -1, 102, 12 );
_fg = new Graphics();
_fg.beginFill( 0xcccccc );
_fg.drawRect( 0, 0, 100, 10 );
_bg.x = _fg.x = ( _kernel.factory.width - 100 ) * .5;
_bg.y = _fg.y = ( _kernel.factory.height - 10 ) * .5;
_context.addChild( _bg );
@@ -31,7 +29,7 @@ class Preloader extends APreloader $(CSLB){
override private function _updater( p_deltaTime:Int = 0 ):Void $(CSLB){
super._updater( p_deltaTime );
_fg.scaleX = progress;
_fg.scale.x = progress;
}
override private function _showAudioHoldMessage():Void $(CSLB){
@@ -1,6 +1,6 @@
package $(PackageDot)scenes;
import awe6.core.Scene;
import awe6.core.drivers.createjs.extras.gui.Text;
import awe6.core.drivers.pixijs.extras.gui.Text;
import awe6.interfaces.ETextStyle;
import awe6.interfaces.EScene;
import awe6.interfaces.IKernel;
@@ -5,7 +5,7 @@ package ;
* @author Robert Fell
*/
@:build( awe6.core.drivers.createjs.AssetsBuilder.build( "bin/", "assets/" ) )
@:build( awe6.core.drivers.pixijs.AssetsBuilder.build( "bin/", "assets/" ) )
class Assets $(CSLB){
}
@@ -4,7 +4,7 @@ package ;
* @author Robert Fell
*/
@:build( awe6.core.drivers.createjs.ConfigBuilder.build( "bin/assets/__Config.xml" ) )
@:build( awe6.core.drivers.pixijs.ConfigBuilder.build( "bin/assets/__Config.xml" ) )
class Config $(CSLB){
}
@@ -1,8 +1,6 @@
import $(PackageDot)Factory;
import awe6.core.Context;
import createjs.easeljs.Stage;
import haxe.Resource;
import js.Browser;
import awe6.core.Context;
/**
$(CBI)* ...
@@ -16,10 +14,7 @@ class Main $(CSLB){
#else
var l_isDebug:Bool = false;
#end
var l_stage = new Stage( cast Browser.document.getElementById( "gameCanvas" ) );
var l_context = new Context();
l_stage.addChild( l_context );
var l_factory = new Factory( l_context, l_isDebug, Resource.getString( "config" ) );
var l_factory = new Factory( new Context(), l_isDebug, Resource.getString( "config" ) );
}
public function new() $(CSLB){
@@ -2,7 +2,7 @@ package ;
import demo.Factory;
import haxe.Resource;
import pixi.core.display.Container;
import awe6.core.Context;
/**
* ...
@@ -18,7 +18,7 @@ class Main
#else
var l_isDebug:Bool = false;
#end
var l_factory = new Factory( new Container(), l_isDebug, Resource.getString( "config" ) );
var l_factory = new Factory( new Context(), l_isDebug, Resource.getString( "config" ) );
}
public function new()
@@ -85,26 +85,26 @@ class AssetManager extends AAssetManager
case OVERLAY_UNPAUSE_OVER : Assets.overlay_buttons_UnpauseOver__png;
case BACKGROUND : Assets.scenes_Background__png;
}
var l_sprite = new Sprite(_kernel.assets.getAsset(l_url).texture);
var l_sprite = new Sprite( _kernel.assets.getAsset( l_url ).texture );
l_context.addChild( l_sprite );
return new View( _kernel, l_context );
}
public function createSphere():Sprite
{
var l_result = new Sprite(_kernel.assets.getAsset(Assets.Sphere__png).texture);
var l_result = new Sprite( _kernel.assets.getAsset( Assets.Sphere__png ).texture );
l_result.blendMode = Math.random() < .5 ? BlendModes.ADD : BlendModes.NORMAL;
return l_result;
}
public function createButtonUp():Sprite
{
return new Sprite(_kernel.assets.getAsset(Assets.ButtonUp__png).texture);
return new Sprite( _kernel.assets.getAsset( Assets.ButtonUp__png ).texture );
}
public function createButtonOver():Sprite
{
return new Sprite(_kernel.assets.getAsset(Assets.ButtonOver__png).texture);
return new Sprite( _kernel.assets.getAsset( Assets.ButtonOver__png ).texture );
}
}
BIN +244 KB (170%) lib/__resources/templates.zip
Binary file not shown.
@@ -1,11 +1,11 @@
{
"name": "awe6",
"license": "MIT",
"tags": ["game","cross","flash","cpp","js","javascript","openfl","html5","openfl","createjs","awe6","entity"],
"tags": ["game","cross","flash","cpp","js","javascript","openfl","html5","openfl","createjs","pixijs","awe6","entity"],
"description": "awe6 is game inverted: a scalable, flexible and intuitive framework for the rapid development of quality games. For more information visit awe6.org",
"contributors": ["hypersurge"],
"releasenote": "Haxe 3.4.4 compatible release. HaxeDevelop support, OpenFL 5 support, fixing macro remap issues. https://github.com/hypersurge/awe6/releases",
"version": "2.7.509",
"releasenote": "Added PixiJS driver and macro enhancements. https://github.com/hypersurge/awe6/releases",
"version": "2.8.548",
"url": "http://awe6.org",
"dependencies": {

0 comments on commit a9b8bfd

Please sign in to comment.