Skip to content

Commit 3d968f8

Browse files
committed
Update to 1.1: Changes to work with migrated Stage3D now contained in the core OpenFL library. Changes to use Vector<T> rather than Array<T> in support of migration and Flash compatibility.
1 parent a8fdfa7 commit 3d968f8

File tree

609 files changed

+4976
-11042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

609 files changed

+4976
-11042
lines changed

README.markdown

100644100755
Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,41 @@ A typical project.xml file would look as follows. Each example in the away3d-exa
2929

3030
<?xml version="1.0" encoding="utf-8"?>
3131
<project>
32-
<meta title="Basic View Example" package="com.geepers.BasicView" version="1.0.0" />
32+
33+
<meta title="Basic View Away3D OpenFL" package="away3d.examples.BasicView" version="1.0.0" />
3334
<app main="Basic_View" file="Basic_View" path="Export" />
34-
<window width="1024" height="700" if="desktop" />
35+
36+
<window width="1024" height="700" if="desktop"/>
3537
<window width="0" height="0" if="html5" />
3638
<window orientation="landscape" vsync="true" if="cpp"/>
37-
<window fps="60" hardware="true" allow-shaders="true" require-shaders="true" depth-buffer="true" stencil-buffer="true" />
39+
<window fps="60" hardware="true" allow-shaders="true" require-shaders="true" depth-buffer="true" stencil-buffer="true" background="#000000" />
40+
3841
<source path="src" />
42+
3943
<haxelib name="format" if="html5" />
4044
<haxelib name="away3d" />
4145
<haxelib name="openfl" />
42-
<assets path="embeds" exclude="openfl.svg" />
43-
<icon path="embeds/openfl.svg" />
46+
47+
<assets path="embeds" exclude="away3d.svg" />
48+
49+
<icon path="embeds/away3d.svg" />
50+
4451
<haxedef name="source-map-content" if="html5" />
4552
<haxedef name="dom" if="html5" />
53+
4654
<android minimum-sdk-version="10" />
55+
4756
</project>
4857

4958

5059
##Dependencies
60+
<<<<<<< HEAD
5161
Requires OpenFL 2.1.8
5262

63+
=======
64+
Requires OpenFL 2.2.4
65+
66+
>>>>>>> d88756b... Update to 1.1: Stage3D implementaion now migrated to OpenFL core library. Changes to support migration
5367
##License
5468

5569
Copyright 2014 The Away3D Team

aglsl/AGALTokenizer.hx

Lines changed: 0 additions & 142 deletions
This file was deleted.

aglsl/AGLSLCompiler.hx

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)