From d99e5992c4a7f2593b26e0ddf2d8c6b1d01f890f Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 5 Feb 2018 16:58:15 -0500
Subject: [PATCH 01/15] whitespace

---
 .../core/parser/Node.js                       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Node.js b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
index fba99c64..156628e8 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Node.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
@@ -52,15 +52,15 @@ class Node {
             'cc.ParticleSystem', 'cc.TiledMap', 'cc.Canvas', 'cc.RichText',
             'cc.VideoPlayer', 'cc.WebView', 'cc.Slider', 'cc.Toggle', 'cc.ToggleGroup',
             'cc.PageView', 'cc.Mask', 'dragonBones.ArmatureDisplay'];
-    
+
         if (!components)
             return 'cc.Node';
-    
+
         let node_components = components.map(x => x.__type__);
         // special case for object without components
         if (node_components.length == 0)
             return 'cc.Node';
-    
+
         for (let i = 0, len = supported_components.length; i < len; ++i) {
             let supported = supported_components[i];
             if (node_components.includes(supported)) {
@@ -72,16 +72,16 @@ class Node {
         Utils.log('treat all unknown components as cc.Node')
         return 'cc.Node';
     }
-    
+
     static guess_type(node_data) {
         let components = Node.get_node_components(node_data);
         if (components)
             return Node.guess_type_from_components(components);
-    
+
         // prefab don't have componets, should guess type from prefab node data
         if (node_data._prefab)
             return 'cc.Prefab';
-    
+
         return null;
     }
 
@@ -147,7 +147,7 @@ class Node {
     parse_properties() {
         // 1st: parse self
         this.parse_node_properties();
-        
+
         // 2nd: parse children
         this.parse_children();
     }
@@ -276,7 +276,7 @@ class Node {
                 addProp(props, 'skewX', result, 'skewX');
                 addProp(props, 'skewY', result, 'skewY');
                 addProp(props, 'opacity', result, 'opacity');
-                
+
 
                 // position -> {x:, y:, curveType?, curveData?}
                 if (props.position) {
@@ -316,7 +316,7 @@ class Node {
                 else
                 {
                     let clip_content = JSON.parse(fs.readFileSync(uuidinfos[clip_uuid]));
-                    
+
                     // parse curveData
                     let animationClip = {
                         name: clip_content._name,
@@ -345,7 +345,7 @@ class Node {
 
                     // parse self animationclip
                     if (curveData.props)
-                        animationClip.curveData.push({props: parseCurveDataProps(curveData.props)}); 
+                        animationClip.curveData.push({props: parseCurveDataProps(curveData.props)});
 
                     anim.clips.push(animationClip);
                     state._clips[clip_uuid] = animationClip;

From 290b1a98a8f2f7ab81455b73751839764ede3d0c Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 5 Feb 2018 23:24:10 -0500
Subject: [PATCH 02/15] move repeated ifs into a object map

---
 .../core/parser/Utils.js                      | 71 +++++++------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index ee98444e..023b37e1 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -251,50 +251,33 @@ let create_node = function (node_type, node_data) {
     const MotionStreak = require('./MotionStreak');
 
     let n = null;
-    if (node_type === 'cc.Node')
-        n = new Node(node_data);
-    else if (node_type === 'cc.Sprite')
-        n = new Sprite(node_data);
-    else if (node_type === 'cc.Canvas')
-        n = new Canvas(node_data);
-    else if (node_type === 'cc.Label')
-        n = new Label(node_data);
-    else if (node_type === 'cc.RichText')
-        n = new RichText(node_data);
-    else if (node_type === 'cc.Button')
-        n = new Button(node_data);
-    else if (node_type === 'cc.ProgressBar')
-        n = new ProgressBar(node_data);
-    else if (node_type === 'cc.ScrollView')
-        n = new ScrollView(node_data);
-    else if (node_type === 'cc.EditBox')
-        n = new EditBox(node_data);
-    else if (node_type === 'cc.TiledMap')
-        n = new TiledMap(node_data);
-    else if (node_type === 'cc.ParticleSystem')
-        n = new ParticleSystem(node_data);
-    else if (node_type === 'sp.Skeleton')
-        n = new SpineSkeleton(node_data);
-    else if (node_type === 'cc.VideoPlayer')
-        n = new VideoPlayer(node_data);
-    else if (node_type === 'cc.WebView')
-        n = new WebView(node_data);
-    else if (node_type === 'cc.Slider')
-        n = new Slider(node_data);
-    else if (node_type === 'cc.Toggle')
-        n = new Toggle(node_data);
-    else if (node_type === 'cc.ToggleGroup')
-        n = new ToggleGroup(node_data);
-    else if (node_type === 'cc.PageView')
-        n = new PageView(node_data);
-    else if (node_type === 'cc.Mask')
-        n = new Mask(node_data);
-    else if (node_type === 'cc.Prefab') 
-        n = new Prefab(node_data);
-    else if (node_type === 'dragonBones.ArmatureDisplay')
-        n = new DragonBones(node_data);
-    else if (node_type === 'cc.MotionStreak')
-        n = new MotionStreak(node_data);
+
+    const classMap = {
+        'cc.Node': Node,
+        'cc.Sprite': Sprite,
+        'cc.Canvas': Canvas,
+        'cc.Label': Label,
+        'cc.RichText': RichText,
+        'cc.Button': Button,
+        'cc.ProgressBar': ProgressBar,
+        'cc.ScrollView': ScrollView,
+        'cc.EditBox': EditBox,
+        'cc.TiledMap': TiledMap,
+        'cc.ParticleSystem': ParticleSystem,
+        'sp.Skeleton': SpineSkeleton,
+        'cc.VideoPlayer': VideoPlayer,
+        'cc.WebView': WebView,
+        'cc.Slider': Slider,
+        'cc.Toggle': Toggle,
+        'cc.ToggleGroup': ToggleGroup,
+        'cc.PageView': PageView,
+        'cc.Mask': Mask,
+        'cc.Prefab': Prefab,
+        'dragonBones.ArmatureDisplay': DragonBones,
+        'cc.MotionStreak': MotionStreak,
+    };
+
+    n = new classMap[node_type](node_data);
 
     if (n != null)
         n.parse_properties();

From 0afdd6a0271f0bb63b4c985f27027a2e7d83fec9 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 5 Feb 2018 23:24:47 -0500
Subject: [PATCH 03/15] first pass at adding in Layout support to flatbuffer

---
 .../creator-luacpp-support/CreatorReader.fbs       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
index c6526039..1db8b645 100644
--- a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
+++ b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
@@ -18,11 +18,14 @@ enum EditBoxInputMode:byte {Any, EmailAddress, Numeric, PhoneNumber, URL, Decime
 enum LabelOverflowType:byte {None, Clamp, Shrink, ResizeHeight, Toggle}
 enum MaskType:byte {Rect, Ellipse, ImageStencil}
 enum ColliderType:byte {BoxCollider, PolygonCollider, CircleCollider}
+enum LayoutType:byte { None = 0, Horizontal = 1, Vertical = 2, Grid = 3 }
+enum ResizeMode:byte { None = 0, Container = 1, Children = 2 }
 
 // New nodes should be added at the end of the union
 // no more than 255 union objects can be added
-union AnyNode {Scene, Sprite, Label, Particle, TileMap, Node, Button, ProgressBar, ScrollView, CreatorScene, 
-               EditBox, RichText, SpineSkeleton, VideoPlayer, WebView, Slider, Toggle, ToggleGroup, PageView, Mask, DragonBones, MotionStreak}
+union AnyNode {Scene, Sprite, Label, Particle, TileMap, Node, Button, ProgressBar, ScrollView, CreatorScene,
+               EditBox, RichText, SpineSkeleton, VideoPlayer, WebView, Slider, Toggle, ToggleGroup, PageView,
+               Mask, DragonBones, MotionStreak}
 
 table SceneGraph
 {
@@ -180,6 +183,13 @@ table Button
     ignoreContentAdaptWithSize:bool = false;
 }
 
+table Layout
+{
+    node:Node;
+    type:LayoutType,
+    resizeMode:ResizeMode
+}
+
 table ProgressBar
 {
     node:Node;

From a8b12accc40b012b577d7f2d2c17aec880cb603d Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 5 Feb 2018 23:27:28 -0500
Subject: [PATCH 04/15] update .gitignore to ignore vim files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f54921af..2bab5b60 100755
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,8 @@ quick_gen_project_*_autogen.sh
 quick_gen_project_*_autogen.sh.meta
 .exvim.app
 *.swp
+*.un~
+tags
 
 #/////////////////////////////////////////////////////////////////////////////
 # webstorm files

From 3c2b1f097684d3ce8ab11f91ac19a994c85d2c72 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 5 Feb 2018 23:29:21 -0500
Subject: [PATCH 05/15] fix fbs syntax and compile

---
 .../creator-luacpp-support/CreatorReader.fbs  |  4 +-
 .../reader/CreatorReader_generated.h          | 77 +++++++++++++++++++
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
index 1db8b645..9d9efa3c 100644
--- a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
+++ b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
@@ -186,8 +186,8 @@ table Button
 table Layout
 {
     node:Node;
-    type:LayoutType,
-    resizeMode:ResizeMode
+    type:LayoutType;
+    resizeMode:ResizeMode;
 }
 
 table ProgressBar
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
index 22cd2c5c..d3f4763a 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
@@ -34,6 +34,8 @@ struct Scene;
 
 struct Button;
 
+struct Layout;
+
 struct ProgressBar;
 
 struct ScrollView;
@@ -313,6 +315,37 @@ inline const char **EnumNamesColliderType() {
 
 inline const char *EnumNameColliderType(ColliderType e) { return EnumNamesColliderType()[static_cast<int>(e)]; }
 
+enum LayoutType {
+  LayoutType_None = 0,
+  LayoutType_Horizontal = 1,
+  LayoutType_Vertical = 2,
+  LayoutType_Grid = 3,
+  LayoutType_MIN = LayoutType_None,
+  LayoutType_MAX = LayoutType_Grid
+};
+
+inline const char **EnumNamesLayoutType() {
+  static const char *names[] = { "None", "Horizontal", "Vertical", "Grid", nullptr };
+  return names;
+}
+
+inline const char *EnumNameLayoutType(LayoutType e) { return EnumNamesLayoutType()[static_cast<int>(e)]; }
+
+enum ResizeMode {
+  ResizeMode_None = 0,
+  ResizeMode_Container = 1,
+  ResizeMode_Children = 2,
+  ResizeMode_MIN = ResizeMode_None,
+  ResizeMode_MAX = ResizeMode_Children
+};
+
+inline const char **EnumNamesResizeMode() {
+  static const char *names[] = { "None", "Container", "Children", nullptr };
+  return names;
+}
+
+inline const char *EnumNameResizeMode(ResizeMode e) { return EnumNamesResizeMode()[static_cast<int>(e)]; }
+
 enum AnyNode {
   AnyNode_NONE = 0,
   AnyNode_Scene = 1,
@@ -1530,6 +1563,50 @@ inline flatbuffers::Offset<Button> CreateButtonDirect(flatbuffers::FlatBufferBui
   return CreateButton(_fbb, node, transition, zoomScale, spriteFrameName ? _fbb.CreateString(spriteFrameName) : 0, pressedSpriteFrameName ? _fbb.CreateString(pressedSpriteFrameName) : 0, disabledSpriteFrameName ? _fbb.CreateString(disabledSpriteFrameName) : 0, ignoreContentAdaptWithSize);
 }
 
+struct Layout FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  enum {
+    VT_NODE = 4,
+    VT_TYPE = 6,
+    VT_RESIZEMODE = 8
+  };
+  const Node *node() const { return GetPointer<const Node *>(VT_NODE); }
+  LayoutType type() const { return static_cast<LayoutType>(GetField<int8_t>(VT_TYPE, 0)); }
+  ResizeMode resizeMode() const { return static_cast<ResizeMode>(GetField<int8_t>(VT_RESIZEMODE, 0)); }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<flatbuffers::uoffset_t>(verifier, VT_NODE) &&
+           verifier.VerifyTable(node()) &&
+           VerifyField<int8_t>(verifier, VT_TYPE) &&
+           VerifyField<int8_t>(verifier, VT_RESIZEMODE) &&
+           verifier.EndTable();
+  }
+};
+
+struct LayoutBuilder {
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_node(flatbuffers::Offset<Node> node) { fbb_.AddOffset(Layout::VT_NODE, node); }
+  void add_type(LayoutType type) { fbb_.AddElement<int8_t>(Layout::VT_TYPE, static_cast<int8_t>(type), 0); }
+  void add_resizeMode(ResizeMode resizeMode) { fbb_.AddElement<int8_t>(Layout::VT_RESIZEMODE, static_cast<int8_t>(resizeMode), 0); }
+  LayoutBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+  LayoutBuilder &operator=(const LayoutBuilder &);
+  flatbuffers::Offset<Layout> Finish() {
+    auto o = flatbuffers::Offset<Layout>(fbb_.EndTable(start_, 3));
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Layout> CreateLayout(flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<Node> node = 0,
+    LayoutType type = LayoutType_None,
+    ResizeMode resizeMode = ResizeMode_None) {
+  LayoutBuilder builder_(_fbb);
+  builder_.add_node(node);
+  builder_.add_resizeMode(resizeMode);
+  builder_.add_type(type);
+  return builder_.Finish();
+}
+
 struct ProgressBar FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_NODE = 4,

From b63a1a6846fae0a68c2f7a4d757cb63c3f6d3641 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Tue, 6 Feb 2018 22:36:40 -0500
Subject: [PATCH 06/15] whitespace

---
 .../creator-luacpp-support/core/parser/Utils.js    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index 023b37e1..7a2855b4 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -40,7 +40,7 @@ let get_sprite_frame_json_by_uuid = function(uuid) {
 
 let is_sprite_frame_from_texture_packer = function(uuid) {
     let json = get_sprite_frame_json_by_uuid(uuid);
-    if (json) 
+    if (json)
         return json.content.atlas !== '';
     else
         return false;
@@ -86,7 +86,7 @@ let get_sprite_frame_name_by_uuid = function(uuid) {
                 sprite_frame_info.texture_path = path_info.relative_path;
                 sprite_frame_info.is_texture_packer = is_texture_packer;
 
-                let sprite_frame_uuid = sprite_frame_info.uuid; 
+                let sprite_frame_uuid = sprite_frame_info.uuid;
                 state._sprite_frames[sprite_frame_uuid] = sprite_frame_info;
 
                 if (sprite_frame_uuid == uuid) {
@@ -164,16 +164,16 @@ let get_spine_info_by_uuid = function (uuid) {
         let contents = fs.readFileSync(jsonfile);
         let contents_json = JSON.parse(contents);
         let current_dir = path.basename(jsonfile, '.json');
-        
+
         let res_dir = path.join(path.dirname(jsonfile), uuid);
-        
+
         let files = fs.readdirSync(res_dir);
         files.forEach(function(file) {
             let fullpath = path.join(res_dir, file);
             //FIXME: have more than one json file?
             state._uuid[uuid] = {fullpath: fullpath, relative_path: current_dir + '/' + file};
         });
-        
+
         // get atlas path
         state._uuid[uuid].atlas_url = get_relative_full_path_by_uuid(contents_json.atlasUrl.__uuid__);
         // add to _uuid to copy resources
@@ -281,13 +281,13 @@ let create_node = function (node_type, node_data) {
 
     if (n != null)
         n.parse_properties();
-       
+
     return n;
 }
 
 /**
  * remove a child from node's children by child's id
- * @param {node} the Node that to be applied to 
+ * @param {node} the Node that to be applied to
  * @param {id} child's id
  */
 let remove_child_by_id = function (node, id) {

From 54d21ffa1b2b89e7e610aaae2ec8b919d3b4daa1 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 7 Feb 2018 15:25:17 -0500
Subject: [PATCH 07/15] add Layout.js base for parser

---
 .../core/parser/Layout.js                     | 19 +++++++++++++++++++
 .../core/parser/MotionStreak.js               |  2 +-
 .../core/parser/Utils.js                      |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 creator_project/packages/creator-luacpp-support/core/parser/Layout.js

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
new file mode 100644
index 00000000..10defb92
--- /dev/null
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -0,0 +1,19 @@
+const Node = require('./Node');
+const Utils = require('./Utils');
+const state = require('./Global').state;
+
+class Layout extends Node {
+    constructor(data) {
+        super(data);
+        this._jsonNode.object_type = 'Layout';
+    }
+
+    parse_properties() {
+        // Don't have to parse children.
+        super.parse_node_properties();
+
+        let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
+    }
+}
+
+module.exports = Layout;
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/MotionStreak.js b/creator_project/packages/creator-luacpp-support/core/parser/MotionStreak.js
index 725b84b1..b4070233 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/MotionStreak.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/MotionStreak.js
@@ -31,4 +31,4 @@ class MotionStreak extends Node {
     }
 }
 
-module.exports = MotionStreak;
\ No newline at end of file
+module.exports = MotionStreak;
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index 7a2855b4..0104ec06 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -249,6 +249,7 @@ let create_node = function (node_type, node_data) {
     const Prefab = require('./Prefab');
     const DragonBones = require('./DragonBones');
     const MotionStreak = require('./MotionStreak');
+    const Layout = require('./Layout');
 
     let n = null;
 
@@ -275,6 +276,7 @@ let create_node = function (node_type, node_data) {
         'cc.Prefab': Prefab,
         'dragonBones.ArmatureDisplay': DragonBones,
         'cc.MotionStreak': MotionStreak,
+        'cc.Layout': Layout,
     };
 
     n = new classMap[node_type](node_data);

From 1bb97fb2c6ae390c6492cdaeae28804861188f2d Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 7 Feb 2018 16:06:39 -0500
Subject: [PATCH 08/15] update CreatorReader.fbs to include Layout, update
 parser/Node.js to recognize Layout before Sprite

---
 .../packages/creator-luacpp-support/CreatorReader.fbs  |  2 +-
 .../creator-luacpp-support/core/parser/Layout.js       |  4 ++--
 .../creator-luacpp-support/core/parser/Node.js         |  2 +-
 .../creator-luacpp-support/core/parser/Utils.js        | 10 +++++++---
 .../reader/CreatorReader_generated.h                   | 10 ++++++++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
index 9d9efa3c..740e383a 100644
--- a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
+++ b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
@@ -25,7 +25,7 @@ enum ResizeMode:byte { None = 0, Container = 1, Children = 2 }
 // no more than 255 union objects can be added
 union AnyNode {Scene, Sprite, Label, Particle, TileMap, Node, Button, ProgressBar, ScrollView, CreatorScene,
                EditBox, RichText, SpineSkeleton, VideoPlayer, WebView, Slider, Toggle, ToggleGroup, PageView,
-               Mask, DragonBones, MotionStreak}
+               Mask, DragonBones, MotionStreak, Layout}
 
 table SceneGraph
 {
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index 10defb92..2532f40b 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -9,10 +9,10 @@ class Layout extends Node {
     }
 
     parse_properties() {
-        // Don't have to parse children.
-        super.parse_node_properties();
+        super.parse_properties();
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
+        this._properties = {node: this._properties};
     }
 }
 
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Node.js b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
index 156628e8..520dca36 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Node.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
@@ -47,7 +47,7 @@ class Node {
 
     static guess_type_from_components(components) {
         // ScrollView, Button & ProgressBar should be before Sprite
-        let supported_components = ['cc.Button', 'cc.ProgressBar', 'cc.ScrollView',
+        let supported_components = ['cc.Button', 'cc.ProgressBar', 'cc.ScrollView', 'cc.Layout',
             'cc.EditBox', 'cc.Label', 'sp.Skeleton', 'cc.Sprite',
             'cc.ParticleSystem', 'cc.TiledMap', 'cc.Canvas', 'cc.RichText',
             'cc.VideoPlayer', 'cc.WebView', 'cc.Slider', 'cc.Toggle', 'cc.ToggleGroup',
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index 0104ec06..94d70ed5 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -251,7 +251,7 @@ let create_node = function (node_type, node_data) {
     const MotionStreak = require('./MotionStreak');
     const Layout = require('./Layout');
 
-    let n = null;
+    let classType = null;
 
     const classMap = {
         'cc.Node': Node,
@@ -279,9 +279,13 @@ let create_node = function (node_type, node_data) {
         'cc.Layout': Layout,
     };
 
-    n = new classMap[node_type](node_data);
+    classType = classMap[node_type]
+
+    let n = null;
+    Utils.log("node_type: "+node_type);
 
-    if (n != null)
+    if (typeof(classType) !== "undefined")
+        n = new classType(node_data);
         n.parse_properties();
 
     return n;
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
index d3f4763a..669aca69 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
@@ -370,12 +370,13 @@ enum AnyNode {
   AnyNode_Mask = 20,
   AnyNode_DragonBones = 21,
   AnyNode_MotionStreak = 22,
+  AnyNode_Layout = 23,
   AnyNode_MIN = AnyNode_NONE,
-  AnyNode_MAX = AnyNode_MotionStreak
+  AnyNode_MAX = AnyNode_Layout
 };
 
 inline const char **EnumNamesAnyNode() {
-  static const char *names[] = { "NONE", "Scene", "Sprite", "Label", "Particle", "TileMap", "Node", "Button", "ProgressBar", "ScrollView", "CreatorScene", "EditBox", "RichText", "SpineSkeleton", "VideoPlayer", "WebView", "Slider", "Toggle", "ToggleGroup", "PageView", "Mask", "DragonBones", "MotionStreak", nullptr };
+  static const char *names[] = { "NONE", "Scene", "Sprite", "Label", "Particle", "TileMap", "Node", "Button", "ProgressBar", "ScrollView", "CreatorScene", "EditBox", "RichText", "SpineSkeleton", "VideoPlayer", "WebView", "Slider", "Toggle", "ToggleGroup", "PageView", "Mask", "DragonBones", "MotionStreak", "Layout", nullptr };
   return names;
 }
 
@@ -473,6 +474,10 @@ template<> struct AnyNodeTraits<MotionStreak> {
   static const AnyNode enum_value = AnyNode_MotionStreak;
 };
 
+template<> struct AnyNodeTraits<Layout> {
+  static const AnyNode enum_value = AnyNode_Layout;
+};
+
 inline bool VerifyAnyNode(flatbuffers::Verifier &verifier, const void *union_obj, AnyNode type);
 
 enum AnimWrapMode {
@@ -4115,6 +4120,7 @@ inline bool VerifyAnyNode(flatbuffers::Verifier &verifier, const void *union_obj
     case AnyNode_Mask: return verifier.VerifyTable(reinterpret_cast<const Mask *>(union_obj));
     case AnyNode_DragonBones: return verifier.VerifyTable(reinterpret_cast<const DragonBones *>(union_obj));
     case AnyNode_MotionStreak: return verifier.VerifyTable(reinterpret_cast<const MotionStreak *>(union_obj));
+    case AnyNode_Layout: return verifier.VerifyTable(reinterpret_cast<const Layout *>(union_obj));
     default: return false;
   }
 }

From 4c8c084c0ff49a57be8e043012aa148c0d4d500f Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 7 Feb 2018 17:21:28 -0500
Subject: [PATCH 09/15] start on layout child inclusion

---
 .../packages/creator-luacpp-support/core/parser/Layout.js       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index 2532f40b..c05825c0 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -12,6 +12,8 @@ class Layout extends Node {
         super.parse_properties();
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
+        let lay_component = Node.get_node_component_of_type(this._node_data, 'cc.Layout');
+
         this._properties = {node: this._properties};
     }
 }

From 0bcc0a5c6fb8c7c892dbd4b839835ead4271681c Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 7 Feb 2018 19:26:17 -0500
Subject: [PATCH 10/15] clean up parser/Utils' if statement

---
 .../packages/creator-luacpp-support/core/parser/Layout.js  | 1 +
 .../packages/creator-luacpp-support/core/parser/Utils.js   | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index c05825c0..16af7e1b 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -9,6 +9,7 @@ class Layout extends Node {
     }
 
     parse_properties() {
+        super.parse_node_properties();
         super.parse_properties();
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index 94d70ed5..f88343d2 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -282,11 +282,14 @@ let create_node = function (node_type, node_data) {
     classType = classMap[node_type]
 
     let n = null;
-    Utils.log("node_type: "+node_type);
+    Utils.log(`node_type being parsed: ${node_type}`);
 
-    if (typeof(classType) !== "undefined")
+    let isValid = typeof(classType) !== "undefined";
+    if (isValid)
+    {
         n = new classType(node_data);
         n.parse_properties();
+    }
 
     return n;
 }

From 3039c706d33d313bfd64ca1e06ebce29084f1fd0 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 7 Feb 2018 20:10:37 -0500
Subject: [PATCH 11/15] add fixme note to 'building in progress' warning

---
 creator_project/packages/creator-luacpp-support/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/creator_project/packages/creator-luacpp-support/main.js b/creator_project/packages/creator-luacpp-support/main.js
index 1f7fb0a6..876d0037 100644
--- a/creator_project/packages/creator-luacpp-support/main.js
+++ b/creator_project/packages/creator-luacpp-support/main.js
@@ -68,6 +68,7 @@ function _checkProject(opt) {
 // 'profile' may be null
 function _build(opt) {
     if (_buildState !== 'sleep' && _buildState !== 'finish') {
+        //FIXME this never gets cleared, giving the impression that the plugin is constantly running
         Editor.warn('[LuaCpp Support] Building in progress');
         return;
     }

From 1309a4e1906193164fdb98adac731d1b5e715192 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 12 Feb 2018 15:21:28 -0500
Subject: [PATCH 12/15] Add cocos2d::ui::Layout::Type support to creator

I'm assuming RELATIVE is the same as GRID
---
 .../convert_fire_to_json.py                   | 28 ++++++++++++++++++-
 .../core/parser/Layout.js                     |  6 ++--
 .../core/parser/Node.js                       | 12 ++++++--
 .../reader/CreatorReader.cpp                  | 26 +++++++++++++++++
 .../reader/CreatorReader.h                    |  3 ++
 5 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/convert_fire_to_json.py b/creator_project/packages/creator-luacpp-support/convert_fire_to_json.py
index a0ffbca6..d74d2842 100755
--- a/creator_project/packages/creator-luacpp-support/convert_fire_to_json.py
+++ b/creator_project/packages/creator-luacpp-support/convert_fire_to_json.py
@@ -150,7 +150,7 @@ def get_node_component_of_type(cls, node, t):
     @classmethod
     def guess_type_from_components(cls, components):
         # ScrollView, Button & ProgressBar should be before Sprite
-        supported_components = ('cc.Button', 'cc.ProgressBar', 'cc.ScrollView',
+        supported_components = ('cc.Button', 'cc.ProgressBar', 'cc.ScrollView', 'cc.Layout',
                 'cc.EditBox', 'cc.Label', 'sp.Skeleton', 'cc.Sprite',
                 'cc.ParticleSystem', 'cc.TiledMap', 'cc.Canvas', 'cc.RichText'
                 )
@@ -194,6 +194,8 @@ def create_node(cls, node_type, node_idx):
             n = ScrollView(state._json_data[node_idx])
         elif node_type == 'sp.Skeleton':
             n = SpineSkeleton(state._json_data[node_idx])
+        elif node_type == 'cc.Layout':
+            n = Layout(state._json_data[node_idx])
 
         if n is not None:
             n.parse_properties()
@@ -640,6 +642,30 @@ def parse_properties(self):
         self._properties['spriteFrameName'] = Node.get_filepath_from_uuid(but_component['_N$normalSprite']['__uuid__'])
         self._properties['ignoreContentAdaptWithSize'] = False
 
+#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Node: Layout
+#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+class Layout(Node):
+    #  Composition:
+    #  - Sprite component
+    #  - Layout component
+    #
+    # custom properties
+    # Layout Type
+    # Resize Type
+
+    def __init__(self, data):
+        super(Layout, self).__init__(data)
+        self._jsonNode['object_type'] = 'Layout'
+
+    def parse_properties(self):
+        super(Layout, self).parse_properties()
+
+        # Move Node properties into 'node' and clean _properties
+        self._properties = {'node': self._properties}
+
+        # TODO: implement layout and resize support
+
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Node: EditBox
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index 16af7e1b..a22f866c 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -9,13 +9,15 @@ class Layout extends Node {
     }
 
     parse_properties() {
-        super.parse_node_properties();
         super.parse_properties();
+        this._properties = {node: this._properties};
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
+
+        //TODO use these components in this._properties ie vertical layout
         let lay_component = Node.get_node_component_of_type(this._node_data, 'cc.Layout');
+        this._properties.type = lay_component._N$layoutType;
 
-        this._properties = {node: this._properties};
     }
 }
 
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Node.js b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
index 520dca36..34b36d0e 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Node.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
@@ -75,13 +75,19 @@ class Node {
 
     static guess_type(node_data) {
         let components = Node.get_node_components(node_data);
-        if (components)
-            return Node.guess_type_from_components(components);
+        if (components) {
+            let guessedType = Node.guess_type_from_components(components);
+            Utils.log('guessed type: ' + guessedType);
+            return guessedType;
+        }
 
         // prefab don't have componets, should guess type from prefab node data
-        if (node_data._prefab)
+        if (node_data._prefab) {
+            Utils.log('guessed type: prefab');
             return 'cc.Prefab';
+        };
 
+        Utils.log('guessed type: null out');
         return null;
     }
 
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
index 45989582..8c4fcdbb 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
@@ -340,6 +340,9 @@ cocos2d::Node* CreatorReader::createTree(const buffers::NodeTree* tree) const
             node = createButton(static_cast<const buffers::Button*>(buffer));
             parsing_button = true;
             break;
+        case buffers::AnyNode_Layout:
+            node = createLayout(static_cast<const buffers::Layout*>(buffer));
+            break;
         case buffers::AnyNode_EditBox:
             node = createEditBox(static_cast<const buffers::EditBox*>(buffer));
             break;
@@ -978,6 +981,29 @@ void CreatorReader::parseButton(cocos2d::ui::Button* button, const buffers::Butt
     }
 }
 
+cocos2d::ui::Layout* CreatorReader::createLayout(const buffers::Layout* layoutBuffer) const
+{
+    
+    ui::Layout* layout = nullptr;
+    
+    layout = ui::Layout::create();
+
+    parseLayout(layout, layoutBuffer);
+    return layout;
+}
+
+void CreatorReader::parseLayout(cocos2d::ui::Layout* layout, const buffers::Layout* layoutBuffer) const
+{
+    const auto& nodeBuffer = layoutBuffer->node();
+    parseNode(layout, nodeBuffer);
+
+    //TODO create resize and layout types (ie stretch, vertical)
+    //NONE, HORIZONTAL, VERTICAL, RELATIVE/GRID
+    cocos2d::ui::Layout::Type layout_type = static_cast<cocos2d::ui::Layout::Type>(layoutBuffer->type());
+    CCLOG("layout_type %i", (int)layout_type);
+    layout->setLayoutType(layout_type);
+}
+
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
 cocos2d::experimental::ui::VideoPlayer* CreatorReader::createVideoPlayer(const buffers::VideoPlayer* videoPlayerBuffer) const
 {
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.h b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.h
index 8f7cef12..42a545d2 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.h
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.h
@@ -116,6 +116,9 @@ class CreatorReader: public cocos2d::Ref
     cocos2d::ui::Button* createButton(const buffers::Button* buttonBuffer) const;
     void parseButton(cocos2d::ui::Button* button, const buffers::Button* buttonBuffer) const;
 
+    cocos2d::ui::Layout* createLayout(const buffers::Layout* buttonBuffer) const;
+    void parseLayout(cocos2d::ui::Layout* button, const buffers::Layout* buttonBuffer) const;
+
     spine::SkeletonAnimation* createSpineSkeleton(const buffers::SpineSkeleton* spineBuffer) const;
     void parseSpineSkeleton(spine::SkeletonAnimation* button, const buffers::SpineSkeleton* spineBuffer) const;
     

From 7394bc5299d84952010fe2c7914fe08ca1aedc54 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 12 Feb 2018 19:31:28 -0500
Subject: [PATCH 13/15] rename type to layoutType, remove prints, add
 background color from Node

---
 .../creator-luacpp-support/CreatorReader.fbs  |  2 +-
 .../core/BuildWorker.js                       |  1 +
 .../core/parser/Button.js                     |  2 +-
 .../core/parser/ConvertFireToJson.js          |  3 +-
 .../core/parser/Layout.js                     | 36 +++++++++++++++++--
 .../core/parser/Node.js                       |  3 --
 .../core/parser/Utils.js                      |  3 +-
 .../reader/CreatorReader.cpp                  | 14 +++++---
 .../reader/CreatorReader_generated.h          | 12 +++----
 9 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
index 740e383a..8fd729be 100644
--- a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
+++ b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
@@ -186,7 +186,7 @@ table Button
 table Layout
 {
     node:Node;
-    type:LayoutType;
+    layoutType:LayoutType;
     resizeMode:ResizeMode;
 }
 
diff --git a/creator_project/packages/creator-luacpp-support/core/BuildWorker.js b/creator_project/packages/creator-luacpp-support/core/BuildWorker.js
index b5b75b77..4c2f2510 100644
--- a/creator_project/packages/creator-luacpp-support/core/BuildWorker.js
+++ b/creator_project/packages/creator-luacpp-support/core/BuildWorker.js
@@ -32,6 +32,7 @@ class BuildWorker extends WorkerBase {
             this._compileJsonToBinary(function() {
                 this._copyResources(copyReourceInfos);
                 Editor.Ipc.sendToAll('creator-luacpp-support:state-changed', 'finish', 100);
+
                 this._callback();
                 Utils.log('[creator-luacpp-support] build end');
             }.bind(this));
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Button.js b/creator_project/packages/creator-luacpp-support/core/parser/Button.js
index 0f806b4e..2147b1a3 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Button.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Button.js
@@ -40,4 +40,4 @@ class Button extends Node {
     }
 }
 
-module.exports = Button;
\ No newline at end of file
+module.exports = Button;
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/ConvertFireToJson.js b/creator_project/packages/creator-luacpp-support/core/parser/ConvertFireToJson.js
index 9ee63007..1c7d2974 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/ConvertFireToJson.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/ConvertFireToJson.js
@@ -108,6 +108,7 @@ class FireParser {
                 fs.close(this._json_file);
             }
         });
+
     }
 }
 
@@ -130,4 +131,4 @@ function parse_fire(filenames, assetpath, path_to_json_files, uuidmaps) {
     return uuid;
 }
 
-module.exports = parse_fire;
\ No newline at end of file
+module.exports = parse_fire;
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index a22f866c..3e4f7e19 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -3,6 +3,38 @@ const Utils = require('./Utils');
 const state = require('./Global').state;
 
 class Layout extends Node {
+    // Example Layout structure
+    /* {
+        "__type__": "cc.Layout",
+        "_name": "",
+        "_objFlags": 0,
+        "node": {
+            "__id__": 4
+        },
+        "_enabled": true,
+        "_layoutSize": {
+            "__type__": "cc.Size",
+            "width": 200,
+            "height": 150
+        },
+        "_resize": 0,
+        "_N$layoutType": 0,
+        "_N$padding": 0,
+        "_N$cellSize": {
+            "__type__": "cc.Size",
+            "width": 40,
+            "height": 40
+        },
+        "_N$startAxis": 0,
+        "_N$paddingLeft": 0,
+        "_N$paddingRight": 0,
+        "_N$paddingTop": 0,
+        "_N$paddingBottom": 0,
+        "_N$spacingX": 0,
+        "_N$spacingY": 0,
+        "_N$verticalDirection": 1,
+        "_N$horizontalDirection": 0
+    } */
     constructor(data) {
         super(data);
         this._jsonNode.object_type = 'Layout';
@@ -14,9 +46,9 @@ class Layout extends Node {
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
 
-        //TODO use these components in this._properties ie vertical layout
         let lay_component = Node.get_node_component_of_type(this._node_data, 'cc.Layout');
-        this._properties.type = lay_component._N$layoutType;
+        this._properties.layoutType = lay_component._N$layoutType;
+        this._properties.resizeMode = lay_component._resize;
 
     }
 }
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Node.js b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
index 34b36d0e..8023de49 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Node.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Node.js
@@ -77,17 +77,14 @@ class Node {
         let components = Node.get_node_components(node_data);
         if (components) {
             let guessedType = Node.guess_type_from_components(components);
-            Utils.log('guessed type: ' + guessedType);
             return guessedType;
         }
 
         // prefab don't have componets, should guess type from prefab node data
         if (node_data._prefab) {
-            Utils.log('guessed type: prefab');
             return 'cc.Prefab';
         };
 
-        Utils.log('guessed type: null out');
         return null;
     }
 
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index f88343d2..68b35efe 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -220,7 +220,7 @@ let get_tiledmap_path_by_uuid = function (uuid) {
     }
 }
 
-let DEBUG = false;
+let DEBUG = true;
 log = function(s) {
     if (DEBUG)
         Utils.log(s);
@@ -282,7 +282,6 @@ let create_node = function (node_type, node_data) {
     classType = classMap[node_type]
 
     let n = null;
-    Utils.log(`node_type being parsed: ${node_type}`);
 
     let isValid = typeof(classType) !== "undefined";
     if (isValid)
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
index 8c4fcdbb..6a76a9a6 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
@@ -997,11 +997,17 @@ void CreatorReader::parseLayout(cocos2d::ui::Layout* layout, const buffers::Layo
     const auto& nodeBuffer = layoutBuffer->node();
     parseNode(layout, nodeBuffer);
 
-    //TODO create resize and layout types (ie stretch, vertical)
-    //NONE, HORIZONTAL, VERTICAL, RELATIVE/GRID
-    cocos2d::ui::Layout::Type layout_type = static_cast<cocos2d::ui::Layout::Type>(layoutBuffer->type());
-    CCLOG("layout_type %i", (int)layout_type);
+    //use layout type
+    //NONE, HORIZONTAL, VERTICAL, RELATIVE(/GRID?)
+    cocos2d::ui::Layout::Type layout_type = static_cast<cocos2d::ui::Layout::Type>(layoutBuffer->layoutType());
     layout->setLayoutType(layout_type);
+
+    //use color from node
+    layout->setBackGroundColor(layout->getColor());
+    layout->setBackGroundColorType(ui::Layout::BackGroundColorType::SOLID);
+
+    //TODO create resize types (ie container, children)
+    auto resizeMode = layoutBuffer->resizeMode();
 }
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
index 669aca69..2ae4bdf8 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
@@ -1571,17 +1571,17 @@ inline flatbuffers::Offset<Button> CreateButtonDirect(flatbuffers::FlatBufferBui
 struct Layout FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_NODE = 4,
-    VT_TYPE = 6,
+    VT_LAYOUTTYPE = 6,
     VT_RESIZEMODE = 8
   };
   const Node *node() const { return GetPointer<const Node *>(VT_NODE); }
-  LayoutType type() const { return static_cast<LayoutType>(GetField<int8_t>(VT_TYPE, 0)); }
+  LayoutType layoutType() const { return static_cast<LayoutType>(GetField<int8_t>(VT_LAYOUTTYPE, 0)); }
   ResizeMode resizeMode() const { return static_cast<ResizeMode>(GetField<int8_t>(VT_RESIZEMODE, 0)); }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NODE) &&
            verifier.VerifyTable(node()) &&
-           VerifyField<int8_t>(verifier, VT_TYPE) &&
+           VerifyField<int8_t>(verifier, VT_LAYOUTTYPE) &&
            VerifyField<int8_t>(verifier, VT_RESIZEMODE) &&
            verifier.EndTable();
   }
@@ -1591,7 +1591,7 @@ struct LayoutBuilder {
   flatbuffers::FlatBufferBuilder &fbb_;
   flatbuffers::uoffset_t start_;
   void add_node(flatbuffers::Offset<Node> node) { fbb_.AddOffset(Layout::VT_NODE, node); }
-  void add_type(LayoutType type) { fbb_.AddElement<int8_t>(Layout::VT_TYPE, static_cast<int8_t>(type), 0); }
+  void add_layoutType(LayoutType layoutType) { fbb_.AddElement<int8_t>(Layout::VT_LAYOUTTYPE, static_cast<int8_t>(layoutType), 0); }
   void add_resizeMode(ResizeMode resizeMode) { fbb_.AddElement<int8_t>(Layout::VT_RESIZEMODE, static_cast<int8_t>(resizeMode), 0); }
   LayoutBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   LayoutBuilder &operator=(const LayoutBuilder &);
@@ -1603,12 +1603,12 @@ struct LayoutBuilder {
 
 inline flatbuffers::Offset<Layout> CreateLayout(flatbuffers::FlatBufferBuilder &_fbb,
     flatbuffers::Offset<Node> node = 0,
-    LayoutType type = LayoutType_None,
+    LayoutType layoutType = LayoutType_None,
     ResizeMode resizeMode = ResizeMode_None) {
   LayoutBuilder builder_(_fbb);
   builder_.add_node(node);
   builder_.add_resizeMode(resizeMode);
-  builder_.add_type(type);
+  builder_.add_layoutType(layoutType);
   return builder_.Finish();
 }
 

From 309a28ae748542e13e2b1a7c00f3f64f894307ff Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Mon, 12 Feb 2018 23:09:21 -0500
Subject: [PATCH 14/15] turn DEBUG back off

---
 .../packages/creator-luacpp-support/core/parser/Utils.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
index 68b35efe..d5e1f935 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Utils.js
@@ -220,7 +220,7 @@ let get_tiledmap_path_by_uuid = function (uuid) {
     }
 }
 
-let DEBUG = true;
+let DEBUG = false;
 log = function(s) {
     if (DEBUG)
         Utils.log(s);

From 4fbea65613af5ba2676a0441856183280d2405b5 Mon Sep 17 00:00:00 2001
From: tankorsmash <tankorsmash@gmail.com>
Date: Wed, 21 Feb 2018 15:32:30 -0500
Subject: [PATCH 15/15] if the layout's sprite is disabled in creator, hide the
 layout's background in cocos

---
 .../creator-luacpp-support/CreatorReader.fbs         |  1 +
 .../creator-luacpp-support/core/parser/Layout.js     |  1 +
 .../creator-luacpp-support/reader/CreatorReader.cpp  |  5 +++++
 .../reader/CreatorReader_generated.h                 | 12 +++++++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
index 8fd729be..362d8037 100644
--- a/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
+++ b/creator_project/packages/creator-luacpp-support/CreatorReader.fbs
@@ -188,6 +188,7 @@ table Layout
     node:Node;
     layoutType:LayoutType;
     resizeMode:ResizeMode;
+    backgroundVisible:bool = true;
 }
 
 table ProgressBar
diff --git a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
index 3e4f7e19..860da52d 100644
--- a/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
+++ b/creator_project/packages/creator-luacpp-support/core/parser/Layout.js
@@ -45,6 +45,7 @@ class Layout extends Node {
         this._properties = {node: this._properties};
 
         let spr_component = Node.get_node_component_of_type(this._node_data, 'cc.Sprite');
+        this._properties.backgroundVisible = spr_component._enabled;
 
         let lay_component = Node.get_node_component_of_type(this._node_data, 'cc.Layout');
         this._properties.layoutType = lay_component._N$layoutType;
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
index 6a76a9a6..21cbc2ea 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader.cpp
@@ -1005,6 +1005,11 @@ void CreatorReader::parseLayout(cocos2d::ui::Layout* layout, const buffers::Layo
     //use color from node
     layout->setBackGroundColor(layout->getColor());
     layout->setBackGroundColorType(ui::Layout::BackGroundColorType::SOLID);
+    if (layoutBuffer->backgroundVisible()) {
+        layout->setBackGroundColorOpacity(255);
+    } else {
+        layout->setBackGroundColorOpacity(0);
+    };
 
     //TODO create resize types (ie container, children)
     auto resizeMode = layoutBuffer->resizeMode();
diff --git a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
index 2ae4bdf8..aa2ce450 100644
--- a/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
+++ b/creator_project/packages/creator-luacpp-support/reader/CreatorReader_generated.h
@@ -1572,17 +1572,20 @@ struct Layout FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   enum {
     VT_NODE = 4,
     VT_LAYOUTTYPE = 6,
-    VT_RESIZEMODE = 8
+    VT_RESIZEMODE = 8,
+    VT_BACKGROUNDVISIBLE = 10
   };
   const Node *node() const { return GetPointer<const Node *>(VT_NODE); }
   LayoutType layoutType() const { return static_cast<LayoutType>(GetField<int8_t>(VT_LAYOUTTYPE, 0)); }
   ResizeMode resizeMode() const { return static_cast<ResizeMode>(GetField<int8_t>(VT_RESIZEMODE, 0)); }
+  bool backgroundVisible() const { return GetField<uint8_t>(VT_BACKGROUNDVISIBLE, 1) != 0; }
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NODE) &&
            verifier.VerifyTable(node()) &&
            VerifyField<int8_t>(verifier, VT_LAYOUTTYPE) &&
            VerifyField<int8_t>(verifier, VT_RESIZEMODE) &&
+           VerifyField<uint8_t>(verifier, VT_BACKGROUNDVISIBLE) &&
            verifier.EndTable();
   }
 };
@@ -1593,10 +1596,11 @@ struct LayoutBuilder {
   void add_node(flatbuffers::Offset<Node> node) { fbb_.AddOffset(Layout::VT_NODE, node); }
   void add_layoutType(LayoutType layoutType) { fbb_.AddElement<int8_t>(Layout::VT_LAYOUTTYPE, static_cast<int8_t>(layoutType), 0); }
   void add_resizeMode(ResizeMode resizeMode) { fbb_.AddElement<int8_t>(Layout::VT_RESIZEMODE, static_cast<int8_t>(resizeMode), 0); }
+  void add_backgroundVisible(bool backgroundVisible) { fbb_.AddElement<uint8_t>(Layout::VT_BACKGROUNDVISIBLE, static_cast<uint8_t>(backgroundVisible), 1); }
   LayoutBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
   LayoutBuilder &operator=(const LayoutBuilder &);
   flatbuffers::Offset<Layout> Finish() {
-    auto o = flatbuffers::Offset<Layout>(fbb_.EndTable(start_, 3));
+    auto o = flatbuffers::Offset<Layout>(fbb_.EndTable(start_, 4));
     return o;
   }
 };
@@ -1604,9 +1608,11 @@ struct LayoutBuilder {
 inline flatbuffers::Offset<Layout> CreateLayout(flatbuffers::FlatBufferBuilder &_fbb,
     flatbuffers::Offset<Node> node = 0,
     LayoutType layoutType = LayoutType_None,
-    ResizeMode resizeMode = ResizeMode_None) {
+    ResizeMode resizeMode = ResizeMode_None,
+    bool backgroundVisible = true) {
   LayoutBuilder builder_(_fbb);
   builder_.add_node(node);
+  builder_.add_backgroundVisible(backgroundVisible);
   builder_.add_resizeMode(resizeMode);
   builder_.add_layoutType(layoutType);
   return builder_.Finish();