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

844 Commits

Author SHA1 Message Date
Ricardo Quesada d23ff0ea2c Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
minggo a587b28e38 Merge pull request #11792 from super626/v3 
particle3d can not be seen when added to scene with terrain
 2015-05-13 09:38:21 +08:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
yangxiao 4d71175318 resove conflict 2015-05-12 12:12:29 +08:00
songchengjiang f25c02f230 fix bugs of terrain 2015-05-11 12:02:32 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
cnsoft 62741e3ff8 fix a nullptr bug. 
get model from : http://pan.baidu.com/s/1sjofSWd pass: 9xis    it will crash in cocos studio or client.
 2015-05-06 14:38:38 +08:00
Ricardo Quesada 90c9dffc1a cleanup Material Code 
- removes unused code
- removes experimental code
 2015-05-05 15:59:41 -07:00
Ricardo Quesada ce95bfe059 Squashed commit of the following: 
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:46:57 2015 -0700

    compiles on win32

commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:01:04 2015 -0700

    compiles on windows!

commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 10:20:13 2015 -0700

    windows fix

    CALLBACK is defined in windows. Use CALLBACK_FN instead

commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 09:51:02 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 17:05:49 2015 -0700

    Material system works Ok.

    Deftaul states are being applyied to RenderState::StateBlock::_default
    state as well!

commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 15:52:09 2015 -0700

    more fixes for material

    blending works as expected

commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 12:14:00 2015 -0700

    compiles on Android

    compiles on Android

commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 11:01:46 2015 -0700

    Cmakefiles

    works with Cmake again

commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat May 2 18:17:50 2015 -0700

    Particle3D working Ok with its own uniforms

commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 17:32:00 2015 -0700

    MeshCommand now works 100% on Material!

commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 15:49:14 2015 -0700

    multiple meshes work Ok

commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 13:43:56 2015 -0700

    Adds `clone` to GLProgramState

commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:54:34 2015 -0700

    adds comment about the glprogramstate bug

commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:28:39 2015 -0700

    some uniforms moved to Material

commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 16:52:07 2015 -0700

    depth test moved to Material!

commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 13:12:28 2015 -0700

    Material/Technique/Pass subclass of RenderState

    Inheritance of RenderState. Code from GamePlay3D

commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 12:05:26 2015 -0700

    same as v3

commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 11:37:40 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 18:02:21 2015 -0700

    fixes on blending

commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:51:05 2015 -0700

    better defaults for StateBlock

commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:46:36 2015 -0700

    RenderState::bind() binds lots of states

commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:40:07 2015 -0700

    Adds REnderState parsing in .material

commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:06:31 2015 -0700

    RenderState added into RenderState

    Code based on GamePlay3D. Adds GamePlay3d License.

commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 11:27:55 2015 -0700

    Merge branch 'v3' into material_system

commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 18:15:12 2015 -0700

    order files alphabetically

    order files alphabetically

commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 17:46:07 2015 -0700

    Adds cmake and android support

commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 16:33:50 2015 -0700

    for some reason the callback was crashing

    ... bug in the callback code?
    in any case, we didn't need it and it was making the code slower.

commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 14:00:24 2015 -0700

    more little fixes

commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 12:11:28 2015 -0700

    MeshCommand using Material internally

    works

commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 10:34:03 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 17:41:27 2015 -0700

    improved readebility of MeshCommand code

commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 15:41:07 2015 -0700

    mesh supports Material

    `Mesh` supports `Material`
    Now `MeshCommand` needs to implement it correctly.

commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 11:23:28 2015 -0700

    Merge branch 'v3' into material_system

commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 17:40:48 2015 -0700

    Adding Material into Mesh

    WIP.

commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:39:54 2015 -0700

    cosmetic

commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:26:41 2015 -0700

    moves even more code form Sprite3D to Mesh

commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:15:21 2015 -0700

    Moves "draw" from `Sprite3D` to `Mesh`

commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 15:00:50 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 14:46:28 2015 -0700

    cosmetic

commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 16:44:21 2015 -0700

    revert my changes...

    ...actually the GLProgramState code was Ok... ouch

commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 15:40:54 2015 -0700

    parsing GLProgramState validates the attributes

commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 12:10:31 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 17:45:34 2015 -0700

    little progress on Sprite3D + Material

    GLProgramState needs to decouple Uniforms from Attributes in
    `applyGLProgram`.

    binding the attributes is something that needs to be done
    at a different order.
    Perhaps the attributes are part of a VAO or something else.
    the method `applyAttributes()` has a variable to avoid that...
    but everything looks very hackish.

commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 15:46:02 2015 -0700

    doesn't crash :)

    but doesn't show anything either

commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 13:35:45 2015 -0700

    adding sprit3d test

commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 12:10:32 2015 -0700

    MeshCommand: initial draw with Material

commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 10:41:05 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 21:57:28 2015 -0700

    adding Material to MeshCommand

commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 19:39:09 2015 -0700

    pre commit before merging MeshCommand

commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 18:19:00 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:22:03 2015 -0700

    Pass conforms to create()/init() pattern

commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:04:19 2015 -0700

    defines are strings

    better error checking when creating objects
    autorelase added in Pass, Material, Technique

commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 11:23:47 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:31:37 2015 -0700

    blur effect works with alpha

commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:35 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:07 2015 -0700

    Material, Technique, Pass: they have parent

commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 21:48:06 2015 -0700

    multipass works

commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:31:04 2015 -0700

    yeah!

    more materials... a lot to do yet

commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:06:46 2015 -0700

    yeah! works!

commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 16:43:54 2015 -0700

    simple test of material system works!!!

commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 13:51:45 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 18:04:23 2015 -0700

    JSON file curated

    fixes minor bugs

commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 17:22:36 2015 -0700

    parsers shaders!

    including uniforms

commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 23:24:18 2015 -0700

    Material parses texture

commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 18:22:33 2015 -0700

    material parsing almost working

commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 09:23:23 2015 -0700

    Merge branch 'v3' into material_system

commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 18:42:42 2015 -0700

    json parsing broken

    ha... I need to parse the content of the file, to the name of the file.
    to be fixed tomorrow

commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 10:19:11 2015 -0700

    Merge branch 'v3' into material_system

commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:41:12 2015 -0700

    Adds more dummy files for material

commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:01:16 2015 -0700

    adds empty test

commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 15:36:24 2015 -0700

    more material fixes

    multiple passes added in renderer

commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 11:52:30 2015 -0700

    Merge branch 'v3' into material_system

commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:42:35 2015 -0700

    Merge branch 'v3' into material_system

commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:18:34 2015 -0700

    Merge branch 'cpp_compiles_on_mac' into material_system

commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:09:59 2015 -0700

    compiles on Mac

commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 13:54:59 2015 -0700

    Merge branch 'v3' into material_system

commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 8 14:16:27 2015 -0700

    Merge branch 'v3' into material_system

commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:15:28 2015 +0800

    Merge branch 'v3' into material_system

commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:13:24 2015 +0800

    little changes to pass

commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:36:43 2015 +0800

    Merge branch 'v3' into material_system

commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:23:17 2015 +0800

    small changes

commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Mar 26 18:20:46 2015 -0700

    initial Material system
 2015-05-05 13:07:32 -07:00
yangxiao 59988fdcc0 missing texture color 2015-04-29 10:30:18 +08:00
yangxiao e424cb4777 fix bug some 3d sprite crash when texture missing on release mode 2015-04-28 23:55:23 +08:00
XiaoYang 8920491287 Merge pull request #314 from lvlonggame/v3 
fix bug: set sprite name
 2015-04-28 12:00:24 +08:00
minggo a32a1029f5 Merge pull request #11617 from lvlonggame/v3 
fix bug: set sprite name
 2015-04-28 09:35:04 +08:00
lvlong cecea92fde fix bug: set sprite name 2015-04-27 19:12:44 +08:00
minggo 0a8f533e80 Merge pull request #11590 from super626/v3 
Animate3D Quality control
 2015-04-27 10:58:10 +08:00
XiaoYang d7deabc3ad Merge pull request #311 from lvlonggame/v3 
animate 3d quality
 2015-04-24 17:54:28 +08:00
minggo 0198c8707b Merge pull request #11572 from super626/v3 
Fix memory leak
 2015-04-24 16:42:33 +08:00
songchengjiang 2aee4abd66 fix https://github.com/cocos2d/cocos2d-x/issues/11203 
fix the error of CCBundle3D
 2015-04-24 15:31:50 +08:00
lvlong a379196340 modify comments 2015-04-24 14:06:20 +08:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
lvlong 59b7ab8154 fix bug: animation curve memory leak ！ 2015-04-23 14:35:37 +08:00
Dale Stammen 516966a96f check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
lvlong 4f96037e15 1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
2. fix bug: memory leak!
 2015-04-21 19:38:38 +08:00
lvlong cae82fcdeb fix bug: memory leak 2015-04-21 15:02:09 +08:00
minggo fa6735e68f Merge pull request #11518 from perminovVS/v3-dev-optimize-vec3-v2.1 
Optimize Vec3 use constructor default.
 2015-04-21 09:33:05 +08:00
yangxiao 7c37123dbd remove fade in animation if no running animation 2015-04-20 19:45:31 +08:00
yangxiao e8b21589fc avoid some remap 2015-04-20 19:33:16 +08:00
yangxiao 1a50610c00 Merge branch 'newcode' into v3 2015-04-20 18:21:07 +08:00
Vladimir Perminov 6ef1e7e3d0 Optimize Vec3 use constructor default. 
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
 2015-04-20 12:56:43 +03:00
yangxiao bc62338b36 map use node instead of sprite 2015-04-20 17:49:01 +08:00
Vladimir Perminov 4c33050536 Optimize Vec2 
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
 2015-04-19 20:40:52 +03:00
yangxiao 8c8058a9be merge cocos resolve conflict 2015-04-14 13:56:05 +08:00
minggo 1ebcca8d9f Merge pull request #11417 from super626/terrain 
Terrain
 2015-04-14 10:50:21 +08:00
XiaoYang 37dc4c33d9 Merge pull request #300 from lvlonggame/v3 
fix bug: create single node recursively.
 2015-04-14 09:10:24 +08:00
zhukaixy 6684491249 1: update cube texture for sky box 
2: add mouse-controled camera for test case (skybox)
 2015-04-14 01:39:23 +08:00
yangxiao 284c8e5a97 add to animation cache 2015-04-13 17:14:58 +08:00
lvlong 57a44194f4 fix bug: create single node Recursively. 2015-04-13 11:35:52 +08:00
tangziwen 380d829548 move reset draw polygon state in corresponding position 2015-04-13 10:14:03 +08:00
minggo 952f9da2c1 Merge pull request #11385 from super626/terrain 
Improve Terrain
 2015-04-13 09:18:50 +08:00
tangziwen a7aed360a1 update terrain 2015-04-10 14:22:07 +08:00
minggo 9891a94e87 Merge pull request #11352 from super626/v3 
Fix Sprite3D memory leak
 2015-04-09 13:57:03 +08:00
yangxiao 575d32c5ec correct words 2015-04-09 11:31:56 +08:00
yangxiao 9cefa3a9da weak ref to vertexdata 2015-04-09 10:52:05 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
lvlong 4c6eec9ec1 add getAABBRecursively 2015-04-03 18:04:33 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
XiaoYang 63a27d14b7 Merge pull request #282 from lvlonggame/terrain 
fix bug: about minFilter and magFilter
 2015-04-02 17:26:35 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 1b63e5168a add to linux 2015-04-02 14:21:51 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain 
update terrain
 2015-04-02 10:19:11 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3 
Release note for texturecube skybox and animtion quality
 2015-04-02 09:39:16 +08:00
minggo 199fb2b694 Merge pull request #11250 from super626/texturecube 
Texturecube Modify
 2015-04-02 09:38:26 +08:00
lvlong 1da7ef121e _aabbDirty = true 2015-04-02 09:33:48 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
yangxiao 2cc9814702 modify 2015-04-01 17:58:41 +08:00
yangxiao 4b7ae430a8 Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube 2015-04-01 17:37:55 +08:00
yangxiao 9540fd590f modify skybox 2015-04-01 17:34:57 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube 
Bug fix: ios devices crash on release mode
 2015-03-31 18:21:22 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
lvlong 5032194e98 modify animate 3d quality to bool 2015-03-30 15:57:58 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
lvlong 6fe9f0d1c8 add comments for 3d animation quality!!! 2015-03-30 14:05:03 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	cocos/base/CCConfiguration.h
 2015-03-30 11:50:01 +08:00
lvlong b2a7a753c2 add comments 2015-03-30 11:44:30 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube 
Texturecube bug fix
 2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3 
node animation support
 2015-03-30 09:32:36 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes... 
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
 2015-03-28 15:11:51 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc 
3d fix doxygen add to group
 2015-03-27 17:09:24 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
yangxiao 7d3154e2e9 add to linux 2015-03-26 14:34:11 +08:00
yangxiao c23746fbcd modify 2015-03-26 13:05:42 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong 6c29385547 animate quality! 2015-03-26 11:33:16 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
zhukaixy aead9e5855 correct for code indent 2015-03-26 09:53:41 +08:00
XiaoYang 11c021881b Merge pull request #263 from lvlonggame/v3 
fix: obj file load material.
 2015-03-26 09:29:58 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
lvlong ecfd66cda3 node frame code!!!!! 2015-03-26 09:12:05 +08:00
minggo cb07aa4ae2 Merge pull request #11091 from super626/v3 
fix memory leak
 2015-03-25 16:16:28 +08:00
yangxiao c6af12bcd9 use CC_SAFE_DELETE 2015-03-25 14:33:53 +08:00
zhukaixy 54472497a4 fix comments 2015-03-25 13:43:55 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +08:00
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
minggo d5e82521de Merge pull request #10359 from flamefox/3dattachnode 
getAttachNode should failed when there is no bone with name
 2015-02-15 19:03:52 +08:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
kompjoefriek 00edc542cb Merged with upstream/v3 
Merged with upstream/v3 and resolved merge conflicts
 2015-02-10 21:27:20 +01:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
yangxiao 265e6fec1a fix index 2015-02-02 16:54:55 +08:00
yangxiao f608377bdb make vao work 2015-02-02 15:44:47 +08:00
zhukaixy 806a5011e5 solve the problems noted in comments 2015-01-30 17:23:30 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
minggo dff7d6f639 Merge pull request #10277 from super626/v3 
fix bug on loading .mtl
 2015-01-29 19:21:31 +08:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +08:00
yangxiao 3eeeaf051f fix load mtl 2015-01-29 17:54:22 +08:00
kompjoefriek 89152b2856 Tabs to spaces 
Changed indenting tabs to spaces
 2015-01-29 10:40:00 +01:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Nite Luo 94d5810efd Merge pull request #10254 from super626/fixbillboard 
Tested locally fix the billboad testcase
 2015-01-28 14:06:53 -08:00
yangxiao fc1dbf49fb fix billboard 2015-01-28 15:21:57 +08:00
Nite Luo be6ca1b6d2 add force depth write 2015-01-27 17:05:51 -08:00
tangziwen 9ec366a130 update terrain test add new method to get normal 2015-01-27 15:18:59 +08:00
tangziwen d6c3320d49 fix memory leak 2015-01-23 18:14:44 +08:00
tangziwen d04b3feb50 add new test, fix memory leak 2015-01-23 18:09:54 +08:00
minggo 44bcee60c7 Merge pull request #10182 from super626/v3 
Fix bug on loading .obj's .mtl file
 2015-01-23 12:02:00 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
lvlong 662117e878 mtlPath 2015-01-22 17:33:24 +08:00
lvlong c5f955466a fixbug: load obj file's material. 2015-01-22 17:28:35 +08:00
minggo 954f372775 Merge pull request #10156 from vovkasm/fix-warnings 
Fix warnings
 2015-01-21 20:23:00 +08:00
Vladimir Timofeev 4e25ffbc7f Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences. 2015-01-21 12:59:53 +03:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
lvlong 7934d36e24 modify function description. 2015-01-20 10:46:00 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
lvlong fc0c4bae7a modify by colleague for cocostudio. 2015-01-16 13:23:03 +08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
tangziwen 130c18bde0 fix LOD indices capacity,refactor the code ,add some comments 2015-01-15 15:54:12 +08:00
tangziwen 804739b38a add cmake 2015-01-15 11:45:51 +08:00
tangziwen 201ae6f321 add terrain 2015-01-15 11:45:06 +08:00
lvlong 6d7b530ea1 fix bug: add animate3D to sequence problem. 2015-01-15 11:32:28 +08:00
Nite Luo 15660926d9 Fix Sprite3D not cascading 3D flag 2015-01-14 16:23:35 -08:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
lvlong 9abc5b7e82 fix bug: sequence action speed 2015-01-14 10:40:47 +08:00
Nite Luo 4335328e3d Add support for creating empty sprite3D 2015-01-13 16:41:24 -08:00
Nite Luo 45562f3203 optimize based on review commends 2015-01-12 22:52:20 -08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix 
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2015-01-12 20:43:55 -08:00
Nite Luo a84f521e64 Clean up the debug functions in Billboard 2015-01-12 20:17:00 -08:00
Nite Luo 8591609128 Implement 3D drawing support for Sprite, Label, Particle, BatchNode 2015-01-12 20:06:50 -08:00
Nite Luo fee8bc1b28 Remove Transparent Queue, Move transform calculation of Billboard to visit 2015-01-12 18:17:47 -08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
lvlong f9b0c9bc92 fix bug. 2015-01-07 11:09:09 +08:00
yangxiao d23eb83ba1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-12-31 11:40:37 +08:00
yangxiao 0963b3d86e add comment 2014-12-29 10:51:16 +08:00