Skip to content

Commit

Permalink
Merge branch 'v2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@PrimaryFeather
PrimaryFeather committed Feb 29, 2016
2 parents 1dec24b + b457111 commit e81c1d8
Show file tree
Hide file tree
Showing 181 changed files with 17,254 additions and 11,194 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
bin-debug/
bin-release/
starling/doc/html/
starling/bin/starling.swc
tests/libs/
out/

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# =================================================================================================

git:
git:
depth: 10

language: objective-c
Expand Down
75 changes: 75 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,81 @@
Starling: Changelog
===================

version 2.0 (beta) - 2016-02-29
-------------------------------

- added render cache: auto-detects if display tree changes, speeds up rendering of unchanged regions
- added 'Mesh' class, the new base class of all non-container display objects
- added 'MeshBatch' class, a more flexible replacement of the old 'QuadBatch'
- added 'MeshStyle' class, allowing customized rendering of any meshes
- added 'Painter' class that replaces 'RenderSupport' and contains a stack of 'RenderStates'
- added 'Effect', 'FilterEffect' & 'MeshEffect', encapsulating low-level stage3D rendering
- added a completely rewritten 'FragmentFilter' API
- added 'FilterChain' class, allowing to combine several filters into one
- added 'DropShadowFilter' and 'GlowFilter'
- added 'RenderState' class, capturing context and other render settings
- added 'Program' class, a comfortable wrapper of stage3D programs that survives a context loss
- added 'VertexDataFormat' and using it in 'VertexData' for flexible vertex data structures
- added 'IndexData' class, the new partner of 'VertexData'
- added 'BatchProcessor' class, the master puppeteer of all batch rendering
- added 'TextFormat' class and using it in TextField and BitmapFont
- added 'TextOptions', 'ITextCompositor', and 'TrueTypeCompositor' for more flexible Text composition
- added 'scale9Grid' property to 'Image' and 'Button'
- added 'tileGrid' property to 'Image'
- added 'scale' property to DisplayObject, for simple uniform scaling
- added 'StringUtil' with methods like 'trim' and 'format'
- added 'Pool' class for simple pooling of basic classes (Point, Vector3D, Rectangle, Matrix)
- added 'getTextureAtlasNames' method to AssetManager
- added 'MatrixUtil.isIdentity'
- added 'pixelSnapping' property to Mesh class (enabled by default)
- added 'wordWrap' property to TextField class
- added frame actions to MovieClip, completely rewrote 'advanceTime'
- added new 'rendering' package and moving some classes over
- added new Benchmark in Demo
- added try/catch around 'executeWhenApplicationIsActive' callbacks
- added second argument to 'EventDispatcher.hasEventListener' to allow checking for a specific listener
- added 'Event.UPDATE' as a new generic event type
- added 'Color.multiply'
- added 'toString' methods to 'MatrixUtil'
- added missing brackets to 'Touch.toString'
- added new DelayedCall-related methods to Juggler
- added 'Button.textureSmoothing' property
- added optional 'width' and 'height' arguments to 'Quad.readjustSize'
- added 'RectangleUtil.extend'
- added 'MathUtil.min', 'MathUtil.max', 'MathUtil.clamp', 'MathUtil.isEquivalent'
- added 'Stage.getStageBounds'
- added 'Mesh.defaultStyle' property, allowing to specify the default style for all meshes
- updated VertexData class to use a ByteArray instead of a Vector
- updated TextFields to always use the minimal possible texture size for TrueType fonts
- updated the Juggler's 'add' methods to return a unique ID that can be used to remove the same object
- updated requirements: now depending on at least AIR / FP 19
- updated transporter chief for compatibility with latest ios-deploy
- replaced all 'splice' calls with new 'insertAt' and 'removeAt' methods
- replaced 'HAlign' and 'VAlign' with one single 'Align' class
- removed 'ArrayUtil' and 'VectorUtil' classes
- removed explicit garbage collection from AssetManager
- removed 'Starling.handleLostContext' (now always enabled)
- removed 'forTouch' argument in 'hitTest'-method
- removed 'repeat' properties and method arguments from Texture classes (to be handled in Image class)
- removed 'nativeFilters' from TextField (hoping that Starling's filters now close that gap)
- removed 'Sprite.clipRect'; instead, 'DisplayObject.mask' was optimized for rectangular masks
- changed organization of 'starling.utils' package
- changed KeyboardEvent to be dispatched instead of broadcasted for better performance
- changed default profile in Starling constructor to 'auto'
- changed default for mipMapping throughout framework to 'false'
- changed 'Texture.fromColor' so that it uses separate color and alpha
- changed naming convention: parameters that need to be filled and returned are now called 'out'
- changed all member variables using the m-prefix to underscores ("mData" => "_data")
- optimized texture classes by splitting up 'ConcreteTexture' into several (internal) subclasses
- optimized 'removeEventListener'
- optimized how the TrueType compositor behaves when it reaches the maximum supported texture size
- optimized rendering of empty TrueType text fields (by not rendering them, at all)
- optimized 'RenderTexture' by disabling double-buffering in 'baselineExtended' and higher profiles
- fixed that autoSizing in TextField always forced specific text alignments.
- fixed 'globalToLocal' for 3D objects
- fixed 'Polygon.toString' for empty polygons
- fixed possible null reference exception in the Button class

version 1.8 - 2016-02-29
------------------------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Simplified BSD License
======================

Copyright 2011-2016 Gamua. All rights reserved.
Copyright 2011-2016 Gamua GmbH. All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ News and Updates
Minimum Requirements
--------------------

* Adobe AIR 3.4 or Flash Player 11.4
* Adobe AIR or Flash Player 19.0
Binary file modified samples/demo/assets/textures/1x/atlas.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 23 additions & 31 deletions samples/demo/assets/textures/1x/atlas.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with TexturePacker http://www.codeandweb.com/texturepacker-->
<!-- $TexturePacker:SmartUpdate:b716c984b1605f3fb7986f09a1122166:80a791fa7206b45fad2c86fd88772866:628d44f20a20d4ab7a3617802fac7201$ -->
<TextureAtlas imagePath="atlas.png">
<SubTexture name="benchmark_object" x="770" y="173" width="32" height="32"/>
<SubTexture name="benchmark_object_small" x="1009" y="1" width="8" height="8"/>
<SubTexture name="brush" x="515" y="144" width="62" height="62" frameX="0" frameY="-1" frameWidth="64" frameHeight="64"/>
<SubTexture name="button_back" x="167" y="530" width="88" height="41"/>
<SubTexture name="button_big" x="167" y="145" width="127" height="42"/>
<SubTexture name="button_medium" x="167" y="188" width="127" height="38"/>
<SubTexture name="button_normal" x="167" y="227" width="127" height="32"/>
<SubTexture name="button_normal_disabled" x="167" y="260" width="127" height="32"/>
<SubTexture name="button_normal_down" x="167" y="293" width="127" height="32"/>
<SubTexture name="button_normal_over" x="167" y="326" width="127" height="32"/>
<SubTexture name="button_square" x="515" y="207" width="42" height="42"/>
<SubTexture name="flight_00" x="1" y="145" width="165" height="163" frameX="-42" frameY="-21" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_01" x="1" y="309" width="165" height="160" frameX="-42" frameY="-23" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_02" x="295" y="337" width="165" height="149" frameX="-42" frameY="-33" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_03" x="578" y="173" width="191" height="142" frameX="-16" frameY="-37" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_04" x="808" y="1" width="200" height="108" frameX="-8" frameY="-68" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_05" x="851" y="353" width="165" height="138" frameX="-42" frameY="-67" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_06" x="1" y="470" width="165" height="143" frameX="-42" frameY="-66" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_07" x="685" y="353" width="165" height="140" frameX="-42" frameY="-66" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_08" x="851" y="492" width="165" height="129" frameX="-42" frameY="-67" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_09" x="461" y="483" width="165" height="129" frameX="-42" frameY="-69" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_10" x="292" y="487" width="165" height="128" frameX="-42" frameY="-72" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_11" x="627" y="494" width="165" height="126" frameX="-42" frameY="-74" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_12" x="770" y="244" width="188" height="108" frameX="-19" frameY="-75" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_13" x="808" y="110" width="199" height="133" frameX="-8" frameY="-50" frameWidth="220" frameHeight="220"/>
<SubTexture name="gamua-logo" x="322" y="144" width="192" height="192"/>
<!-- $TexturePacker:SmartUpdate:538fbefcc0f16e1650d929a002c66263:4f715245e0566aa66ce3289b0cb2a6f3:628d44f20a20d4ab7a3617802fac7201$ -->
<TextureAtlas imagePath="atlas.png" width="788" height="788">
<SubTexture name="benchmark_object" x="337" y="754" width="32" height="32"/>
<SubTexture name="brush" x="1" y="704" width="63" height="64" frameX="0" frameY="0" frameWidth="64" frameHeight="64"/>
<SubTexture name="button" x="314" y="514" width="44" height="44" frameX="0" frameY="-1" frameWidth="45" frameHeight="45"/>
<SubTexture name="flight_00" x="194" y="348" width="167" height="165" frameX="-41" frameY="-20" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_01" x="146" y="514" width="167" height="162" frameX="-41" frameY="-22" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_02" x="362" y="312" rotated="true" width="151" height="167" frameX="-41" frameY="-32" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_03" x="1" y="510" rotated="true" width="144" height="193" frameX="-15" frameY="-36" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_04" x="230" y="145" rotated="true" width="110" height="202" frameX="-7" frameY="-67" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_05" x="511" y="144" rotated="true" width="140" height="167" frameX="-41" frameY="-66" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_06" x="514" y="312" rotated="true" width="145" height="167" frameX="-41" frameY="-65" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_07" x="362" y="480" width="167" height="142" frameX="-41" frameY="-65" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_08" x="652" y="137" rotated="true" width="131" height="167" frameX="-41" frameY="-66" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_09" x="530" y="480" rotated="true" width="131" height="167" frameX="-41" frameY="-68" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_10" x="337" y="623" width="167" height="130" frameX="-41" frameY="-71" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_11" x="505" y="648" width="167" height="128" frameX="-41" frameY="-73" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_12" x="146" y="677" width="190" height="110" frameX="-18" frameY="-74" frameWidth="220" frameHeight="220"/>
<SubTexture name="flight_13" x="579" y="1" width="201" height="135" frameX="-7" frameY="-49" frameWidth="220" frameHeight="220"/>
<SubTexture name="gamua-logo" x="1" y="317" width="192" height="192"/>
<SubTexture name="logo" x="1" y="1" width="320" height="143"/>
<SubTexture name="starling_front" x="167" y="359" width="124" height="170"/>
<SubTexture name="starling_front" x="660" y="305" width="124" height="170"/>
<SubTexture name="starling_rocket" x="322" y="1" width="256" height="142"/>
<SubTexture name="starling_round" x="515" y="316" width="169" height="166" frameX="0" frameY="0" frameWidth="169" frameHeight="167"/>
<SubTexture name="starling_sheet" x="579" y="1" width="228" height="171"/>
<SubTexture name="starling_round" x="341" y="144" width="169" height="167"/>
<SubTexture name="starling_sheet" x="1" y="145" width="228" height="171"/>
</TextureAtlas>
Binary file modified samples/demo/assets/textures/2x/atlas.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 23 additions & 31 deletions samples/demo/assets/textures/2x/atlas.xml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with TexturePacker http://www.codeandweb.com/texturepacker-->
<!-- $TexturePacker:SmartUpdate:b716c984b1605f3fb7986f09a1122166:80a791fa7206b45fad2c86fd88772866:628d44f20a20d4ab7a3617802fac7201$ -->
<TextureAtlas imagePath="atlas.png">
<SubTexture name="benchmark_object" x="1027" y="369" width="63" height="63" frameX="-1" frameY="-1" frameWidth="64" frameHeight="64"/>
<SubTexture name="benchmark_object_small" x="2015" y="1" width="16" height="16"/>
<SubTexture name="brush" x="1871" y="571" width="128" height="124" frameX="0" frameY="-2" frameWidth="128" frameHeight="128"/>
<SubTexture name="button_back" x="1871" y="489" width="175" height="81"/>
<SubTexture name="button_big" x="333" y="288" width="253" height="83"/>
<SubTexture name="button_medium" x="333" y="372" width="253" height="75"/>
<SubTexture name="button_normal" x="333" y="448" width="253" height="63"/>
<SubTexture name="button_normal_disabled" x="333" y="512" width="253" height="63"/>
<SubTexture name="button_normal_down" x="333" y="576" width="253" height="63"/>
<SubTexture name="button_normal_over" x="333" y="640" width="253" height="63"/>
<SubTexture name="button_square" x="1027" y="285" width="83" height="83"/>
<SubTexture name="flight_00" x="1" y="288" width="331" height="327" frameX="-83" frameY="-41" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_01" x="1" y="616" width="331" height="321" frameX="-83" frameY="-46" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_02" x="587" y="670" width="331" height="301" frameX="-83" frameY="-64" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_03" x="1111" y="344" width="382" height="285" frameX="-32" frameY="-74" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_04" x="1612" y="1" width="402" height="218" frameX="-15" frameY="-135" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_05" x="1698" y="707" width="331" height="278" frameX="-83" frameY="-133" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_06" x="1" y="938" width="331" height="287" frameX="-83" frameY="-132" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_07" x="1366" y="707" width="331" height="281" frameX="-83" frameY="-132" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_08" x="1698" y="986" width="331" height="259" frameX="-83" frameY="-134" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_09" x="919" y="964" width="331" height="259" frameX="-83" frameY="-138" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_10" x="582" y="972" width="331" height="257" frameX="-83" frameY="-143" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_11" x="1251" y="989" width="331" height="252" frameX="-83" frameY="-148" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_12" x="1494" y="489" width="376" height="217" frameX="-38" frameY="-150" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_13" x="1612" y="220" width="399" height="268" frameX="-15" frameY="-99" frameWidth="440" frameHeight="440"/>
<SubTexture name="gamua-logo" x="642" y="285" width="384" height="384"/>
<!-- $TexturePacker:SmartUpdate:538fbefcc0f16e1650d929a002c66263:4f715245e0566aa66ce3289b0cb2a6f3:628d44f20a20d4ab7a3617802fac7201$ -->
<TextureAtlas imagePath="atlas.png" width="1568" height="1568">
<SubTexture name="benchmark_object" x="1484" y="493" width="64" height="64"/>
<SubTexture name="brush" x="1" y="1375" rotated="true" width="126" height="128" frameX="0" frameY="-1" frameWidth="128" frameHeight="128"/>
<SubTexture name="button" x="1003" y="628" width="85" height="85" frameX="-2" frameY="-3" frameWidth="90" frameHeight="90"/>
<SubTexture name="flight_00" x="1" y="1045" width="333" height="329" frameX="-82" frameY="-40" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_01" x="631" y="963" width="333" height="323" frameX="-82" frameY="-45" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_02" x="965" y="963" width="333" height="303" frameX="-82" frameY="-63" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_03" x="1" y="288" width="384" height="287" frameX="-31" frameY="-73" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_04" x="1155" y="1" width="404" height="220" frameX="-14" frameY="-134" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_05" x="669" y="1287" width="333" height="280" frameX="-82" frameY="-132" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_06" x="341" y="956" rotated="true" width="289" height="333" frameX="-82" frameY="-131" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_07" x="1003" y="1267" width="333" height="283" frameX="-82" frameY="-131" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_08" x="380" y="622" rotated="true" width="261" height="333" frameX="-82" frameY="-133" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_09" x="335" y="1290" width="333" height="261" frameX="-82" frameY="-137" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_10" x="1299" y="878" rotated="true" width="259" height="333" frameX="-82" frameY="-142" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_11" x="386" y="288" rotated="true" width="254" height="333" frameX="-82" frameY="-147" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_12" x="1" y="576" width="378" height="219" frameX="-37" frameY="-149" frameWidth="440" frameHeight="440"/>
<SubTexture name="flight_13" x="1155" y="222" width="401" height="270" frameX="-14" frameY="-98" frameWidth="440" frameHeight="440"/>
<SubTexture name="gamua-logo" x="1099" y="493" width="384" height="384"/>
<SubTexture name="logo" x="1" y="1" width="640" height="286"/>
<SubTexture name="starling_front" x="333" y="704" width="248" height="339"/>
<SubTexture name="starling_front" x="1" y="796" rotated="true" width="339" height="248"/>
<SubTexture name="starling_rocket" x="642" y="1" width="512" height="283"/>
<SubTexture name="starling_round" x="1027" y="630" width="338" height="333" frameX="0" frameY="0" frameWidth="338" frameHeight="334"/>
<SubTexture name="starling_sheet" x="1155" y="1" width="456" height="342"/>
<SubTexture name="starling_round" x="642" y="628" width="338" height="334"/>
<SubTexture name="starling_sheet" x="642" y="285" width="456" height="342"/>
</TextureAtlas>
4 changes: 2 additions & 2 deletions samples/demo/demo-shared.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-18" />
<sdk name="air-19" />
</dependencies>
<compiler-options />
<packaging-air-desktop />
Expand All @@ -25,7 +25,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
</content>
<orderEntry type="jdk" jdkName="air-18" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-19" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="starling" exported="" />
</component>
Expand Down
Loading

0 comments on commit e81c1d8

Please sign in to comment.