Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,582 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4133 Commits

Author SHA1 Message Date
Huabing.Xu 4e94eaabed Merge branch 'v3' into v3Animation 2014-06-13 12:06:11 +08:00
Huabing.Xu f7b8acd6fd change pointer to std::vector for mesh 2014-06-13 11:59:13 +08:00
yangxiao ae0b850d89 boneblendstate 30% 2014-06-12 18:32:47 +08:00
minggo eb21bf1ad1 Merge pull request #7030 from Rumist/v3 
#5506 bug fix
 2014-06-12 16:16:13 +08:00
yangxiao ee5aa0f648 android work 2014-06-12 15:42:53 +08:00
minggo 5a28ba68b4 Merge pull request #7031 from sachingarg05/GLProgramNoAbort 
GLProgram should not abort() if shader compilation fails, returning false is better.
 2014-06-12 15:03:29 +08:00
minggo ed14108ab1 Merge pull request #7042 from Dhilan007/v3-systemfont-ios 
LinWenhai	fixed calculating height of multi-line string was incorrect on IOS.
 2014-06-12 14:44:26 +08:00
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
minggo 5c718e27da Merge pull request #7044 from Dhilan007/v3-label-improve 
Ensuring release cache texture in timely.
 2014-06-12 11:39:36 +08:00
minggo c5a8ba3a2c Merge pull request #7043 from Dhilan007/v3-texturecachefix 
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
 2014-06-12 11:35:34 +08:00
Dhilan007 d755b7ffcb issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file. 2014-06-12 11:21:42 +08:00
LinWenhai b268536385 fixed typo. 2014-06-12 09:46:18 +08:00
Dale Stammen 775832a710 added missing files 2014-06-11 13:18:10 -07:00
Dhilan007 7cc3879257 Ensuring release cache texture in timely. 2014-06-11 22:03:10 +08:00
Dhilan007 63a68632a5 fixed calculating height of multi-line string was incorrect on IOS. 2014-06-11 21:49:08 +08:00
Huabing.Xu f1bc0971aa extract mesh data, material data, skin data into a header file for reuse in converter and engine 2014-06-11 18:24:14 +08:00
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
Huabing.Xu 18663609b4 add interface for speed and playback in animate 2014-06-11 15:07:37 +08:00
minggo ccb24abf52 Merge pull request #7028 from heliclei/cocos-version 
[ccconsole]Add version command.
 2014-06-11 14:49:47 +08:00
yangxiao d76525ced1 use my data temp 2014-06-11 14:20:14 +08:00
yangxiao 5b05ab6353 fix rendering bug 2014-06-11 14:05:35 +08:00
Huabing.Xu 9ee6f1f3e0 adjust shader uniform settings 
use a new fake data for testing
 2014-06-11 12:07:25 +08:00
Huabing.Xu a8c321fe64 add use glprogram before setting uniform data for meshcommand 2014-06-11 11:34:04 +08:00
CocosRobot 818c478224 [AUTO]: updating luabinding automatically 2014-06-11 02:30:38 +00:00
samuele3hu 4ce2d7f193 Update values of KeyCode used in the Lua to fix related error 2014-06-11 10:10:11 +08:00
yangxiao cddad40ec0 make it rotate 2014-06-11 10:01:52 +08:00
Sachin Garg 8ba4c7a083 GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device). 2014-06-10 17:59:15 +05:30
yangxiao 6d09b50699 animation bug 2014-06-10 19:53:06 +08:00
elsanide 2e73f63156 #5506 bug fix 
when Director->convertToUI() called, returned wrong value.

kazmath code (under 3.0 version.)
//********************************************************
kmVec3* kmVec3TransformCoord(kmVec3* pOut, const kmVec3* pV, const kmMat4* pM)
{
 /*
        a = (Vx, Vy, Vz, 1)
        b = (a×M)T
        Out = 1 ⁄ bw(bx, by, bz)
 */

    kmVec4 v;
    kmVec4 inV;
    kmVec4Fill(&inV, pV->x, pV->y, pV->z, 1.0);

    kmVec4Transform(&v, &inV,pM);

 pOut->x = v.x / v.w;
 pOut->y = v.y / v.w;
 pOut->z = v.z / v.w;

 return pOut;
}
//********************************************************

Mat4.h & MathUtil version (3.1 or later)
//********************************************************
inline void MathUtil::transformVec4(const float* m, const float* v, float* dst)
{
    // Handle case where v == dst.
    float x = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
    float y = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
    float z = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
    float w = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];

    dst[0] = x;
    dst[1] = y;
    dst[2] = z;
    dst[3] = w;
}

//****************************************************

Transforms 3-D vector or an array of 3-D vectors using a given matrix, projecting the result back into w = 1.
but, it is not apply w = 1.
 2014-06-10 18:15:07 +09:00
heliclei d4a9640a5e [ccconsole]Add version command. 2014-06-10 16:29:06 +08:00
minggo d7af5eccd4 Merge pull request #7024 from pandamicro/SpriteFrame_Ctor 
Issue #5533: Add SpriteFrame's constructor
 2014-06-10 13:38:27 +08:00
pandamicro 8bc531a0fb Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
pandamicro 92a33225ff Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues 2014-06-10 11:39:48 +08:00
samuele3hu aa877f2b50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-10 11:31:08 +08:00
samuele3hu 5a80b4da2e Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget 2014-06-10 11:30:39 +08:00
pandamicro bb7cf801e6 Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected 2014-06-10 11:28:34 +08:00
minggo 0ca9a98f4a Merge pull request #6920 from minggo/orrderOfArrival 
don't have to set _orderOfArrival to 0 after visit
 2014-06-10 10:28:38 +08:00
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
minggo 9517f9b852 Merge pull request #6996 from newnon/v3_setparent_fix 
move node from one parent to another fix
 2014-06-09 17:13:59 +08:00
minggo 66c7b85134 fix issue on Xcode 6 2014-06-09 17:06:40 +08:00
CocosRobot e2630f915d [AUTO]: updating luabinding automatically 2014-06-09 07:30:49 +00:00
minggo 8a3e64918d Merge pull request #7014 from andyque/ImproveUIText 
improve UIText
 2014-06-09 15:27:04 +08:00
CocosRobot e1a43d8ac4 [AUTO]: updating luabinding automatically 2014-06-09 07:20:59 +00:00
minggo ecf32bcbf7 Merge pull request #7015 from andyque/improveUITextField 
add getStringLength to UITextField
 2014-06-09 15:16:47 +08:00
andyque d46025af64 Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField 
Conflicts:
	cocos/ui/UITextField.h
 2014-06-09 14:46:04 +08:00
andyque b7c8759f3b modify outline size parameter 2014-06-09 14:37:56 +08:00
andyque a52532c3c5 Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText 
Conflicts:
	cocos/ui/UIText.cpp
 2014-06-09 14:17:57 +08:00
minggo 59c7b7e9a0 Merge pull request #7004 from Dhilan007/v3-labelfix 
close issue#5158:Label's display may go bonkers if using outline feature.
 2014-06-09 14:17:46 +08:00
minggo 48443b8d52 Merge pull request #7008 from visiblelight/ProgramState 
Fix issue 5393
 2014-06-09 11:47:57 +08:00
CocosRobot 638f7f12c5 [AUTO]: updating luabinding automatically 2014-06-09 03:15:50 +00:00