yangxiao
1db3d14896
reset bone number to 60, put test in alphabetical order
2014-08-22 16:06:36 +08:00
yangxiao
6ff2aa2755
change skin joint count to 40
2014-08-22 15:00:34 +08:00
lvlong
d00bcbccb0
add texture coord2-7
2014-08-21 18:14:24 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
yangxiao
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
lvlong
43bc54b134
delete empty line
2014-08-18 20:28:59 +08:00
lvlong
7311d5139b
add VERTEX_ATTRIB_TEX_COORD1
2014-08-18 18:02:58 +08:00
Huabing.Xu
5e7b75c5c7
fix android background and foreground crash for primitive
2014-08-15 14:05:17 +08:00
yangxiao
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
Huabing.Xu
6cf2e7d091
add CC_DLL for primitive classes
2014-08-12 11:56:21 +08:00
Huabing.Xu
1145859d38
remove commented codes
2014-08-12 11:44:06 +08:00
Huabing.Xu
c1a71453d5
Merge branch 'v3_renderPrimitive' into v3
2014-08-11 14:39:16 +08:00
Huabing.Xu
be4bcf7c36
add init value for flag
2014-08-08 13:47:50 +08:00
Huabing.Xu
e7e94ffe70
add const constrain for getVertexData() and getIndexData()
2014-08-07 17:59:36 +08:00
Huabing.Xu
274140fbf8
linux work now
2014-08-07 02:35:04 -07:00
Huabing.Xu
9891f438ba
change copyright
2014-08-07 15:53:20 +08:00
Huabing.Xu
ba2ae6826c
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
2014-08-07 15:36:41 +08:00
Huabing.Xu
9978065d00
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
2014-08-07 15:13:47 +08:00
Huabing.Xu
16842b4a69
android work now, add shadowBuffer to recreate VBO
2014-08-07 14:15:49 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
Huabing.Xu
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
Huabing.Xu
b1954ef516
clean up primitive code
2014-08-05 17:49:35 +08:00
Huabing.Xu
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
Huabing.Xu
7fbd81aeca
add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib
2014-08-05 15:15:17 +08:00
Huabing.Xu
56551e6787
fast_tmx migrate to primitive command
2014-08-05 15:08:01 +08:00
Huabing.Xu
95a8b23d64
fix draw bug in primitive when using indices
2014-08-04 17:56:56 +08:00
Huabing.Xu
a0d1b0dad8
allow null index buffer when create primitive
2014-08-04 17:21:23 +08:00
Huabing.Xu
2dca0a4809
remove IndexData class
2014-08-04 17:00:08 +08:00
Huabing.Xu
bbf11f5d06
refactor vertex data
...
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
Huabing.Xu
f269d7345e
original version of PrimitiveCommand
2014-08-01 14:46:35 +08:00
Huabing.Xu
dfee337db1
original version of Primitive
2014-07-31 13:52:39 +08:00
Huabing.Xu
99eed6a0be
finish index data
2014-07-30 15:51:41 +08:00
Huabing.Xu
23406c6463
Merge branch 'v3' into v3_renderPrimitive
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-07-30 15:09:25 +08:00
boyu0
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00
boyu0
34a8d26124
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
2014-07-25 18:19:04 +08:00
Huabing.Xu
68894e622f
add indexData
2014-07-25 11:58:54 +08:00
Huabing.Xu
a4cd61f30a
compiles OK: raw version of vertex Index buffer, half version of vertex data
2014-07-25 09:58:24 +08:00
Huabing.Xu
b281c38c20
init version of VertexIndexBuffer
2014-07-23 09:20:33 +08:00
Sergey
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
Huabing.Xu
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
Huabing.Xu
952ca0eb75
add CC_DLL in Renderer folder
2014-07-14 17:02:06 +08:00
Dhilan007
d8cdb75851
Fix compile errors on WP8
2014-07-11 15:10:19 +08:00
minggo
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
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +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
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
yangxiao
e9d3bc1b76
remove unused code
2014-07-08 13:36:22 +08:00
yangxiao
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
Huabing.Xu
9fb85e303f
change the logic of texture loading
2014-07-08 10:08:02 +08:00
Huabing.Xu
d935b5db38
roll back initWithImage logic
2014-07-07 17:35:05 +08:00
yangxiao
4304d740b4
delete call back
2014-07-04 17:22:39 +08:00
yangxiao
0af286c3be
fix android background to foreground
2014-07-04 16:10:43 +08:00
yangxiao
d2cd2449d8
adjust code
2014-07-04 10:42:02 +08:00
yangxiao
05d20d59d4
change position attributes to vec3
2014-07-04 09:25:06 +08:00
boyu0
6db8ec8aad
fix crash when load pvr bgra8888 image in android.
2014-06-30 20:58:26 +08:00
Huabing.Xu
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
yangxiao
fd41f33165
unused code
2014-06-27 17:21:39 +08:00
yangxiao
343ef9ae55
update sprite3d test
2014-06-27 16:36:01 +08:00
Huabing.Xu
7254977358
roll back quadcommand
2014-06-27 12:44:19 +08:00
yangxiao
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +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
Huabing.Xu
e19ce7054b
add comments
2014-06-26 11:21:29 +08:00
yangxiao
accf6f91ea
render optimization
2014-06-25 17:36:55 +08:00
Huabing.Xu
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
yangxiao
617ec1dcf9
support vao
2014-06-24 19:45:51 +08:00
Huabing.Xu
740372ceb3
new version of rendering for tile map
2014-06-24 11:04:17 +08:00
yangxiao
ace56df74d
batch sprite3D rendering
2014-06-24 09:27:10 +08:00
yangxiao
c03ac80700
Sprite3D render batch, not finished
2014-06-23 23:58:45 +08:00
yangxiao
c65e5d6872
simplify shader, bath sprite3D render
2014-06-23 19:08:26 +08:00
Timur Losev
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
minggo
cdbd3508d4
Merge pull request #7139 from zawasp/uniform_struct
...
fix warning Uniform is struct, not class.
2014-06-19 20:55:37 +08:00
gin0606
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
Mircea Rila
69f1bb6193
fix warning Uniform is struct, not class.
2014-06-19 11:46:00 +03:00
minggo
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
Dale Stammen
b66269d85d
Merge branch 'v3' into wp8-v3-template
2014-06-16 09:11:27 -07:00
yangxiao
452fdc047a
Merge branch 'newcode' into v3
2014-06-16 22:36:01 +08:00
yangxiao
36808abb72
simplify shader
2014-06-16 19:23:51 +08:00
yangxiao
dd8f66ce57
merge loader
2014-06-16 00:01:38 +08:00
yangxiao
9dd7241176
load c3t animation work 90%
2014-06-15 22:45:56 +08:00
lvlong
4ae01d148f
11
2014-06-13 19:26:46 +08:00
minggo
7c789e6a36
Merge pull request #7049 from dabingnn/v3_fixDeleteTexture
...
fix bug for deleteTexture
2014-06-13 15:26:16 +08:00
Huabing.Xu
4e94eaabed
Merge branch 'v3' into v3Animation
2014-06-13 12:06:11 +08:00
Dale Stammen
70f3f0f913
release glTextures before reloading cached textures
2014-06-12 16:31:46 -07:00
Dale Stammen
48404a8fb5
fixed reloading of textures from VolatileTexture cache
2014-06-12 16:31:07 -07:00
Dale Stammen
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
lvlong
dbadabb6e9
skin: getPosition()
2014-06-12 18:46:45 +08:00
lvlong
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
Huabing.Xu
9acf8e6253
fix bug for deleteTexture
2014-06-12 15:22:41 +08:00
minggo
5a28ba68b4
Merge pull request #7031 from sachingarg05/GLProgramNoAbort
...
GLProgram should not abort() if shader compilation fails, returning false is better.
2014-06-12 15:03:29 +08:00
Dhilan007
d755b7ffcb
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
2014-06-12 11:21:42 +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
Sachin Garg
8ba4c7a083
GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device).
2014-06-10 17:59:15 +05:30
yangxiao
6d09b50699
animation bug
2014-06-10 19:53:06 +08:00
yangxiao
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +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
yangxiao
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
yangxiao
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
vision
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