New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update flatbuffers to 1.5 #17349

Merged
merged 8 commits into from Feb 14, 2017

Conversation

Projects
None yet
3 participants
@minggo
Contributor

minggo commented Feb 13, 2017

No description provided.

@minggo minggo merged commit f54c41c into cocos2d:v3 Feb 14, 2017

2 checks passed

Jenkins CI Build successfully!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@whitegfx

This comment has been minimized.

Show comment
Hide comment
@whitegfx

whitegfx Feb 14, 2017

Contributor

thank you for your time

Contributor

whitegfx commented Feb 14, 2017

thank you for your time

stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Feb 15, 2017

Merge commit '8cb299eb2b5654cefed3ec811fc5a9df3e6389c5' into scgamex-…
…futurePRs

* commit '8cb299eb2b5654cefed3ec811fc5a9df3e6389c5':
  fix lua binding string conversion (cocos2d#17367)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17366)
  Fix glfw mac os 10.12.2 (cocos2d#17351)
  Updates license year. (cocos2d#17363)
  Update license to 2017 (cocos2d#17362)
  Update flatbuffers to 1.5 (cocos2d#17349)
@yinjimmy

This comment has been minimized.

Show comment
Hide comment
@yinjimmy

yinjimmy Mar 4, 2017

Contributor

Can cocos2d-x 3.14.1 load .csb file that generated from the latest Cocos Studio ?

Contributor

yinjimmy commented Mar 4, 2017

Can cocos2d-x 3.14.1 load .csb file that generated from the latest Cocos Studio ?

@minggo

This comment has been minimized.

Show comment
Hide comment
@minggo

minggo Mar 6, 2017

Contributor

Can not ensure it. But i think it could because the UI tests uses .csb files too.

Contributor

minggo commented Mar 6, 2017

Can not ensure it. But i think it could because the UI tests uses .csb files too.

@yinjimmy

This comment has been minimized.

Show comment
Hide comment
@yinjimmy

yinjimmy Mar 6, 2017

Contributor

@minggo
Thanks for your reply.

After testing cpp-tests Mac, there is no any case with .csb file, just ui module.

And I create one case, but crash:

image

test code:

UICSBTest.hpp":

//
//  UICSBTest.hpp
//  cocos2d_tests
//
//  Created by z on 3/6/17.
//
//

#ifndef UICSBTest_hpp
#define UICSBTest_hpp

#include "UIScene.h"

DEFINE_TEST_SUITE(UICSBTests);

class UICSBTest : public UIScene
{
public:
    CREATE_FUNC(UICSBTest);
    
    
    UICSBTest();
    ~UICSBTest();
    
    bool init() override;
    
};


#endif /* UICSBTest_hpp */

UICSBTest.cpp:

//
//  UICSBTest.cpp
//  cocos2d_tests
//
//  Created by z on 3/6/17.
//
//

#include "UICSBTest.hpp"
#include "editor-support/cocostudio/CocoStudio.h"

USING_NS_CC;
using namespace cocos2d::ui;

UICSBTests::UICSBTests()
{
    ADD_TEST_CASE(UICSBTest);
}


UICSBTest::UICSBTest()
{
}

UICSBTest::~UICSBTest()
{
    
}

bool UICSBTest::init()
{
    
    if (UIScene::init())
    {
        Size widgetSize = _widget->getContentSize();

        auto node = cocos2d::CSLoader::createNode("ccs-res/cocosui/100/100.csb");
        addChild(node);
        
        return true;
    }
    return false;
}

BTW: Is here any way to convert .csd file to .csb file without Cocos Studio?

Contributor

yinjimmy commented Mar 6, 2017

@minggo
Thanks for your reply.

After testing cpp-tests Mac, there is no any case with .csb file, just ui module.

And I create one case, but crash:

image

test code:

UICSBTest.hpp":

//
//  UICSBTest.hpp
//  cocos2d_tests
//
//  Created by z on 3/6/17.
//
//

#ifndef UICSBTest_hpp
#define UICSBTest_hpp

#include "UIScene.h"

DEFINE_TEST_SUITE(UICSBTests);

class UICSBTest : public UIScene
{
public:
    CREATE_FUNC(UICSBTest);
    
    
    UICSBTest();
    ~UICSBTest();
    
    bool init() override;
    
};


#endif /* UICSBTest_hpp */

UICSBTest.cpp:

//
//  UICSBTest.cpp
//  cocos2d_tests
//
//  Created by z on 3/6/17.
//
//

#include "UICSBTest.hpp"
#include "editor-support/cocostudio/CocoStudio.h"

USING_NS_CC;
using namespace cocos2d::ui;

UICSBTests::UICSBTests()
{
    ADD_TEST_CASE(UICSBTest);
}


UICSBTest::UICSBTest()
{
}

UICSBTest::~UICSBTest()
{
    
}

bool UICSBTest::init()
{
    
    if (UIScene::init())
    {
        Size widgetSize = _widget->getContentSize();

        auto node = cocos2d::CSLoader::createNode("ccs-res/cocosui/100/100.csb");
        addChild(node);
        
        return true;
    }
    return false;
}

BTW: Is here any way to convert .csd file to .csb file without Cocos Studio?

@minggo

This comment has been minimized.

Show comment
Hide comment
@minggo

minggo Mar 6, 2017

Contributor

Oh, sorry, it uses json files. Cocos studio is canceled, we short of resource to support it.

Contributor

minggo commented Mar 6, 2017

Oh, sorry, it uses json files. Cocos studio is canceled, we short of resource to support it.

@yinjimmy

This comment has been minimized.

Show comment
Hide comment
@yinjimmy

yinjimmy Mar 7, 2017

Contributor

OK

$ flatc --version
flatc version 1.5.0 (Mar  7 2017)
$ flatc -c  CSParseBinary.fbs
error: /Volumes/data/work/cocos2d-x-3.14.1/cocos/editor-support/cocostudio/fbs-files/CSParseBinary.fbs:287:0: error: expecting: ; instead got: identifier: f

.

Contributor

yinjimmy commented Mar 7, 2017

OK

$ flatc --version
flatc version 1.5.0 (Mar  7 2017)
$ flatc -c  CSParseBinary.fbs
error: /Volumes/data/work/cocos2d-x-3.14.1/cocos/editor-support/cocostudio/fbs-files/CSParseBinary.fbs:287:0: error: expecting: ; instead got: identifier: f

.

@minggo

This comment has been minimized.

Show comment
Hide comment
@minggo

minggo Mar 7, 2017

Contributor

As you can see in the PR, i also updated .fbs files too.

Contributor

minggo commented Mar 7, 2017

As you can see in the PR, i also updated .fbs files too.

@minggo minggo deleted the minggo:update-flatbuffers branch Mar 20, 2017

This was referenced Jun 15, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment