bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
045af3f7a3
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-02 11:24:38 +08:00
18d06015c6
Added More Models
...
Code optimization
2014-09-02 11:24:19 +08:00
de80d8c344
fix warning
2014-09-02 11:22:01 +08:00
39e33cbf71
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-02 11:12:24 +08:00
de3921c101
fix render stats bug
2014-09-02 11:12:15 +08:00
57dd8fd4e1
remove commented code
2014-09-01 15:19:02 +08:00
c24701ac79
Merge branch 'newcode' into v3
2014-09-01 15:11:27 +08:00
dad62ad6df
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/renderer/CCQuadCommand.h
2014-09-01 14:27:19 +08:00
06eb6c2425
put TrianglesCommand in a seperate file
2014-09-01 11:49:04 +08:00
49e6b098a6
check running scene when checkVisibility
2014-09-01 09:56:05 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
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
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
8e51377f2d
fix primitive draw error
2014-08-29 16:00:04 +08:00
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
18a0f34c5c
Merge branch 'newcode' into billboard
2014-08-29 10:12:00 +08:00
528f4b5c0c
fix TextureAtlas drawNumberofQuads bug
2014-08-29 10:06:44 +08:00
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
c5a152708d
clear transparent queue
2014-08-28 13:35:32 +08:00
fdcef01244
remove v_normal when no lights
2014-08-28 13:04:49 +08:00
08006aa47a
Merge branch 'v3' into v3_trianglesCommand
2014-08-28 10:56:38 +08:00
52b2b1d2cb
transparent render queue
2014-08-28 10:53:57 +08:00
014ba0d12e
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
2014-08-28 10:17:32 +08:00
5067741140
Deleted Plane Model
2014-08-28 10:16:15 +08:00
bdf92cfbd4
Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched
2014-08-28 09:58:39 +08:00
d0943afb62
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-08-28 09:24:04 +08:00
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
365c57bc2b
replaced Light Shader by optimized Light Shader
2014-08-27 23:40:49 +08:00
26dc7de802
Repaired Light Shader BUG On ios
2014-08-27 21:03:52 +08:00
72773a806c
decompose Light Struct
2014-08-27 19:12:49 +08:00
c627affa5e
add triangles command, make quad command inherit from triangles command
2014-08-27 18:39:49 +08:00
a71f42c817
add transparent queue
2014-08-27 17:53:46 +08:00
731d1165c3
Spot Light Shader optimization
2014-08-27 17:09:20 +08:00
91e332c253
dynamic update index for quad command
2014-08-27 16:43:14 +08:00
682bcf9755
Tab Format
2014-08-27 16:28:53 +08:00
53ad652463
Light Shader optimization
2014-08-27 16:26:01 +08:00
c4ecff9804
temp backup
2014-08-27 14:54:35 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
26f7345693
2d cull only for default camera
2014-08-27 12:09:23 +08:00
c5515874d5
merge cocos
2014-08-27 11:00:14 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
65b0cca132
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-08-26 14:37:56 +08:00
3369bb7e51
Replaced Tab Format
2014-08-26 14:25:01 +08:00
cf964d62de
Light Shader optimization
2014-08-26 14:18:22 +08:00
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
1a1ccda3ed
repaired Action BUG
2014-08-25 13:58:15 +08:00
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
1db3d14896
reset bone number to 60, put test in alphabetical order
2014-08-22 16:06:36 +08:00
6ff2aa2755
change skin joint count to 40
2014-08-22 15:00:34 +08:00
d00bcbccb0
add texture coord2-7
2014-08-21 18:14:24 +08:00
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
e42eb950a3
Name modification
2014-08-21 11:33:00 +08:00
5bad6e216b
Added No Normal Shader
2014-08-21 10:33:16 +08:00
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
8b5bd3dbb6
Repaired the errors of Shader PassValue On Android
...
Light modification
2014-08-20 16:20:22 +08:00
58abc4c08f
Light Shader modification for Android
2014-08-19 19:24:19 +08:00
4cf1c6a47c
deleted redundant code
...
Replace Tab Format
2014-08-19 16:32:49 +08:00
d9bf2c2b7e
Finished Light And Test
2014-08-19 15:51:30 +08:00
680f089ae1
Shader: Light struct modification
2014-08-19 13:54:30 +08:00
43bc54b134
delete empty line
2014-08-18 20:28:59 +08:00
9603366fcb
Fixed Android compiled Problem
2014-08-18 18:05:13 +08:00
7311d5139b
add VERTEX_ATTRIB_TEX_COORD1
2014-08-18 18:02:58 +08:00
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
9b3a02f350
Added Light Test
...
Added Point Light
2014-08-17 21:33:33 +08:00
def3f8220b
Fixed GLProgram
2014-08-15 19:24:06 +08:00
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
5e7b75c5c7
fix android background and foreground crash for primitive
2014-08-15 14:05:17 +08:00
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
6cf2e7d091
add CC_DLL for primitive classes
2014-08-12 11:56:21 +08:00
1145859d38
remove commented codes
2014-08-12 11:44:06 +08:00
c1a71453d5
Merge branch 'v3_renderPrimitive' into v3
2014-08-11 14:39:16 +08:00
be4bcf7c36
add init value for flag
2014-08-08 13:47:50 +08:00
e7e94ffe70
add const constrain for getVertexData() and getIndexData()
2014-08-07 17:59:36 +08:00
274140fbf8
linux work now
2014-08-07 02:35:04 -07:00
9891f438ba
change copyright
2014-08-07 15:53:20 +08:00
ba2ae6826c
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
2014-08-07 15:36:41 +08:00
9978065d00
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
2014-08-07 15:13:47 +08:00
16842b4a69
android work now, add shadowBuffer to recreate VBO
2014-08-07 14:15:49 +08:00
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
b1954ef516
clean up primitive code
2014-08-05 17:49:35 +08:00
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
7fbd81aeca
add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib
2014-08-05 15:15:17 +08:00
56551e6787
fast_tmx migrate to primitive command
2014-08-05 15:08:01 +08:00
95a8b23d64
fix draw bug in primitive when using indices
2014-08-04 17:56:56 +08:00
a0d1b0dad8
allow null index buffer when create primitive
2014-08-04 17:21:23 +08:00
2dca0a4809
remove IndexData class
2014-08-04 17:00:08 +08:00
bbf11f5d06
refactor vertex data
...
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
f269d7345e
original version of PrimitiveCommand
2014-08-01 14:46:35 +08:00
dfee337db1
original version of Primitive
2014-07-31 13:52:39 +08:00
99eed6a0be
finish index data
2014-07-30 15:51:41 +08:00
23406c6463
Merge branch 'v3' into v3_renderPrimitive
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-07-30 15:09:25 +08:00
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00
34a8d26124
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
2014-07-25 18:19:04 +08:00
68894e622f
add indexData
2014-07-25 11:58:54 +08:00
a4cd61f30a
compiles OK: raw version of vertex Index buffer, half version of vertex data
2014-07-25 09:58:24 +08:00
b281c38c20
init version of VertexIndexBuffer
2014-07-23 09:20:33 +08:00
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
952ca0eb75
add CC_DLL in Renderer folder
2014-07-14 17:02:06 +08:00
d8cdb75851
Fix compile errors on WP8
2014-07-11 15:10:19 +08:00
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
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
0f7968de89
Merge pull request #7339 from super626/v3
...
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
e9d3bc1b76
remove unused code
2014-07-08 13:36:22 +08:00
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
9fb85e303f
change the logic of texture loading
2014-07-08 10:08:02 +08:00
d935b5db38
roll back initWithImage logic
2014-07-07 17:35:05 +08:00
4304d740b4
delete call back
2014-07-04 17:22:39 +08:00
0af286c3be
fix android background to foreground
2014-07-04 16:10:43 +08:00
d2cd2449d8
adjust code
2014-07-04 10:42:02 +08:00
05d20d59d4
change position attributes to vec3
2014-07-04 09:25:06 +08:00
6db8ec8aad
fix crash when load pvr bgra8888 image in android.
2014-06-30 20:58:26 +08:00
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
fd41f33165
unused code
2014-06-27 17:21:39 +08:00
343ef9ae55
update sprite3d test
2014-06-27 16:36:01 +08:00
7254977358
roll back quadcommand
2014-06-27 12:44:19 +08:00
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
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
e19ce7054b
add comments
2014-06-26 11:21:29 +08:00
accf6f91ea
render optimization
2014-06-25 17:36:55 +08:00
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
617ec1dcf9
support vao
2014-06-24 19:45:51 +08:00
740372ceb3
new version of rendering for tile map
2014-06-24 11:04:17 +08:00
ace56df74d
batch sprite3D rendering
2014-06-24 09:27:10 +08:00
c03ac80700
Sprite3D render batch, not finished
2014-06-23 23:58:45 +08:00
c65e5d6872
simplify shader, bath sprite3D render
2014-06-23 19:08:26 +08:00
196a924f89
- Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the
...
cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
2014-06-22 20:53:01 +03:00
cdbd3508d4
Merge pull request #7139 from zawasp/uniform_struct
...
fix warning Uniform is struct, not class.
2014-06-19 20:55:37 +08:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
69f1bb6193
fix warning Uniform is struct, not class.
2014-06-19 11:46:00 +03:00
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
b66269d85d
Merge branch 'v3' into wp8-v3-template
2014-06-16 09:11:27 -07:00
452fdc047a
Merge branch 'newcode' into v3
2014-06-16 22:36:01 +08:00
36808abb72
simplify shader
2014-06-16 19:23:51 +08:00
dd8f66ce57
merge loader
2014-06-16 00:01:38 +08:00
9dd7241176
load c3t animation work 90%
2014-06-15 22:45:56 +08:00
4ae01d148f
11
2014-06-13 19:26:46 +08:00
7c789e6a36
Merge pull request #7049 from dabingnn/v3_fixDeleteTexture
...
fix bug for deleteTexture
2014-06-13 15:26:16 +08:00
4e94eaabed
Merge branch 'v3' into v3Animation
2014-06-13 12:06:11 +08:00
70f3f0f913
release glTextures before reloading cached textures
2014-06-12 16:31:46 -07:00
48404a8fb5
fixed reloading of textures from VolatileTexture cache
2014-06-12 16:31:07 -07:00
49a94a20ef
added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures
2014-06-12 16:28:38 -07:00
dbadabb6e9
skin: getPosition()
2014-06-12 18:46:45 +08:00
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
9acf8e6253
fix bug for deleteTexture
2014-06-12 15:22:41 +08:00
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
d755b7ffcb
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
2014-06-12 11:21:42 +08:00
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
5b05ab6353
fix rendering bug
2014-06-11 14:05:35 +08:00
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
6d09b50699
animation bug
2014-06-10 19:53:06 +08:00
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +08:00
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
860057c307
Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories.
2014-06-05 10:58:27 +08:00
c90f2b3251
remove unused codes in CCTexture2D
2014-06-05 10:09:36 +08:00
54caf26a57
animation3d
2014-06-04 18:17:09 +08:00
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
e1bb1c62c0
[hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-29 10:26:07 +08:00
99d1ccf41e
remove foreground event listener when GLProgramState is deleted
2014-05-28 16:51:33 +08:00
2084fc4ddc
using lambda function instead of member function
2014-05-28 15:50:37 +08:00
30f4f256d8
fix background/forground of Sprite3D on android platform
2014-05-28 15:16:00 +08:00
e2ce876260
remove new lines
2014-05-23 18:01:17 +08:00
ffdf3d7b67
assure threading safety
2014-05-23 17:59:34 +08:00
fb6ea21ca8
assure threading safety
2014-05-23 17:49:25 +08:00
e3a365ad60
assure threading safety
2014-05-23 17:48:07 +08:00
8128bfce68
check the condition guard
2014-05-23 17:27:59 +08:00
66a33e7d93
no need to pass all the references
2014-05-23 17:21:46 +08:00
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
a68515dbff
adding guard for the callback condition
2014-05-22 12:42:52 +08:00
2a7b223b5b
updated link() for wp8
2014-05-20 11:47:33 -07:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
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
2014-05-16 14:36:00 -07:00
38b4e7ad2c
fix memory leak for GLProgramState create logic
2014-05-16 11:02:23 -07:00
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
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
2014-05-14 10:07:09 -07:00
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
7d7d0b8251
Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header
...
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 18:07:18 +08:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
8aea6fe89f
fixes more indentation issues
2014-05-13 00:10:01 -07:00
f25de7869b
indentation issues
2014-05-12 23:57:46 -07:00
71848aca93
Initial multitexturing support
2014-05-12 23:51:37 -07:00
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
14b6a046a3
Warning fix in CCDeprecated.cpp and CCGLProgramState.h
2014-05-11 12:14:17 +08:00
605fe8e4f3
fixes double free crash on GLProgramStateCache
2014-05-09 21:06:02 -07:00
488a8deae9
Shader fixes for windows
2014-05-09 19:13:12 -07:00
8f71e65482
Compiles on windows, sort of
2014-05-09 19:07:22 -07:00
b62f4e51a4
Updates Linux project
2014-05-09 18:40:53 -07:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
faf617bc37
fixes for Linux
2014-05-09 16:57:11 -07:00
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
879958855b
UniformValue use union array
2014-05-09 14:38:36 -07:00
739af170ad
compiles and runs on Windows!!!
2014-05-09 13:24:56 -07:00
dec753f0c4
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-09 11:36:02 -07:00
34a87f8332
Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram
2014-05-09 11:28:16 -07:00
00834b1d6e
adds missing files for Windows
2014-05-09 11:28:06 -07:00
a986455e63
store useCache in GLProgramState
2014-05-09 10:23:24 -07:00
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
yangxiao