Ricardo Quesada
872e4f5a4f
removes logging
2015-06-02 17:50:34 -07:00
Ricardo Quesada
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
Ricardo Quesada
c693573d77
more samples
...
and API fixes
2015-05-12 22:24:52 -07:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -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
zhukaixy
806a5011e5
solve the problems noted in comments
2015-01-30 17:23:30 +08:00
zhukaixy
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +08:00
Huabing.Xu
d5416d8a7a
refresh attributes and uniforms in glprogramstate
2015-01-12 14:43:31 +08:00
Huabing.Xu
c60c3fb2b1
refresh uniforms and attributes when access uniform or attribute table
2014-12-30 18:32:09 +08:00
Huabing.Xu
485c72651d
exextract updateUniformsAndAttributes
2014-12-30 11:13:14 +08:00
Dale Stammen
a5b1faa379
added winrt and wp8 support for EVENT_RENDERER_RECREATED
2014-11-21 10:00:34 -08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
teivaz
bfe83e5624
* [WP8] Enabled GLProgramState restoring on render recreated
2014-10-24 16:00:08 +03:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
oleksandr.kuznietsov
1fbdbfc8f4
Updated pull request #7065 due to new changes in current branch
...
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
2014-06-26 13:26:41 +03:00
yangxiao
accf6f91ea
render optimization
2014-06-25 17:36:55 +08:00
yangxiao
617ec1dcf9
support vao
2014-06-24 19:45:51 +08:00
Huabing.Xu
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
yangxiao
5b05ab6353
fix rendering bug
2014-06-11 14:05:35 +08:00
vision
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
Huabing.Xu
99d1ccf41e
remove foreground event listener when GLProgramState is deleted
2014-05-28 16:51:33 +08:00
Huabing.Xu
2084fc4ddc
using lambda function instead of member function
2014-05-28 15:50:37 +08:00
Huabing.Xu
30f4f256d8
fix background/forground of Sprite3D on android platform
2014-05-28 15:16:00 +08:00
Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00
Huabing.Xu
38b4e7ad2c
fix memory leak for GLProgramState create logic
2014-05-16 11:02:23 -07:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
Ricardo Quesada
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
Ricardo Quesada
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
Ricardo Quesada
f25de7869b
indentation issues
2014-05-12 23:57:46 -07:00
Ricardo Quesada
71848aca93
Initial multitexturing support
2014-05-12 23:51:37 -07:00
Ricardo Quesada
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
Ricardo Quesada
739af170ad
compiles and runs on Windows!!!
2014-05-09 13:24:56 -07:00
yangxiao
a986455e63
store useCache in GLProgramState
2014-05-09 10:23:24 -07:00
yangxiao
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00