8f5cd6cdc8
remove setParent
2015-09-10 09:28:01 +08:00
64471fab85
fix material clone
2015-09-10 09:23:02 +08:00
14b9c2e75c
Fix crash in FrameBuffer if no DepthStencil
...
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
2015-09-08 13:13:38 -07:00
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
137d180dc9
fix material clone
2015-09-07 13:59:08 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
bc07d7954a
fix render state
2015-08-28 23:00:45 +08:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
d5d1be93cc
make it compile on win32
2015-08-26 10:16:50 -07:00
d17c04cf0e
tmp
2015-08-26 16:35:42 +08:00
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
cbd7eed9c4
fixed renderTexture crash bug.
2015-08-21 17:38:56 +08:00
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00
a011fa4c8a
Merge pull request #12852 from super626/issue10242
...
fix #10242 , reload shader when light number changed
2015-07-30 12:57:32 +08:00
e4cf89e1c4
terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing.
2015-07-29 13:24:12 +08:00
92ec9ab5f2
add config loaded event
2015-07-24 16:38:30 +08:00
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
69e79ed164
fix #10242 , reload shader when light number changed
2015-07-15 11:36:53 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
d9bc8b7c1b
fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback.
2015-07-09 17:06:55 +08:00
1f8b46e911
Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync.
2015-07-08 15:13:48 +08:00
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
13dbd44250
remove unused variable
2015-06-25 15:05:21 +08:00
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
cc00cbedbe
Merge pull request #12482 from yangws/fixbug_20214
...
fixbug: cpp-test -> NewRenderer （drag the layer to test the result of…
2015-06-23 21:09:59 +08:00
60372056ce
Merge pull request #12484 from andyque/fix-nine-patch-image-error
...
fix nine patch image parser error on Windows.
2015-06-23 18:26:16 +08:00
2a0c2b6e32
Merge pull request #12250 from hawkwood/patch-10
...
Fails if file does not exist
2015-06-23 17:32:47 +08:00
7fff2bd3c4
fix nine patch image parser error on Windows.
2015-06-23 15:42:58 +08:00
4b768c5fd8
fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen.
2015-06-23 15:22:27 +08:00
a2deddcf59
Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib
...
fix android background and foreground bug with VertexAttributeBinding
2015-06-17 09:34:47 +08:00
90db6fe5d6
Added check that callback is set
2015-06-15 23:36:04 -07:00
9378b6704c
Moved file check to alternate location
2015-06-15 23:31:52 -07:00
19982aae00
fix android background and foreground bug with VertexAttributeBinding
2015-06-16 14:04:50 +08:00
b167ab3e78
StateBlock() is public
2015-06-15 17:43:37 -07:00
ca3da86da7
StateBlock::restore() is public
...
It is possible to restore to default state
2015-06-15 14:12:44 -07:00
d0db40c4a6
Merge pull request #12080 from linshun/v3
...
issue #12078 added audio, network, physics, platform and storage group.
2015-06-15 12:45:11 +08:00
5c419ff7bc
compiles on windows
2015-06-12 20:49:20 -07:00
9b7c12aa38
updates invalidate documentation
2015-06-12 17:44:48 -07:00
a8cf72dc43
pass bits to invalidate
2015-06-12 17:14:09 -07:00
4278bf51b1
Adds RenderState::StateBlock::invalidate();
...
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
2015-06-12 16:47:08 -07:00
097bf455c2
Rename CCRenderBufferObject to CCRenderBuffer in windows projects.
2015-06-11 11:45:10 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
852639cfe7
Added empty string check
2015-06-09 09:19:04 -07:00
67a94c4485
compiles on android and linux
2015-06-09 17:57:07 +08:00
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
eca488b85a
Fails if file does not exist
...
This adds a callback with nullptr if the file does not exists. Checking this before checking cache means that if a file is cached then deleted, the async call will fail. To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE.
If leaving check where it is, on failure should it also check if the file was cached and remove it?
2015-06-08 17:14:15 -07:00
dae8f788c1
improve rendering of inner shapes when outline is used
2015-06-08 12:56:43 +03:00
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
453a3d93bc
samplers are treated as uniforms
2015-06-05 14:55:33 -07:00
d35a8a3a9e
add default FBO
2015-06-04 15:53:13 +08:00
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
b8957b176a
fixes win compilation issues
2015-06-02 23:31:57 -07:00
872e4f5a4f
removes logging
2015-06-02 17:50:34 -07:00
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
9bf15877e5
add applyViewport in camera.
2015-05-29 15:52:06 +08:00
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
2d6d1b7a8c
add android background and foreground switch support for framebufferobject
2015-05-28 17:08:36 +08:00
9ffbe39f18
DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget
2015-05-27 18:16:05 +08:00
9d4e50f3a5
add optional params for RenderTarget creation
2015-05-27 16:59:54 +08:00
471547e0b0
refactor FrameBufferObject to FrameBufferObject and RenderTarget
2015-05-27 11:40:12 +08:00
246913c092
Fix bug: skybox can't move to other position except origin point in world space.
2015-05-26 17:14:26 +08:00
83bae15caf
Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-05-26 12:06:05 +08:00
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
273ac5d00a
Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix
...
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
2015-05-25 16:29:43 +08:00
234ad668ec
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
2015-05-25 11:47:37 +08:00
0352a7a3ea
add Android 9-patch image format support
...
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
f2d3ecad48
Removes state from MeshCommand.
...
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
2015-05-20 15:57:26 -07:00
ac54dad9a0
MeshCommand uses StateBlock
...
When MeshCommand is used with GLProgramState, it will use the StateBlock
internally, instead of the manual and error prone way of keeping state
2015-05-19 18:13:18 -07:00
aa027fbe0f
Properties fixes
...
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
2015-05-19 13:51:52 -07:00
8d3ade78ca
Add CC_DLL to Class FrameBufferObject.
2015-05-19 13:50:10 +08:00
75f740add5
linux works
2015-05-18 18:08:15 +08:00
7b76d5fc41
Merge pull request #11871 from walzer/v3
...
fixed #11821 , after release StateBlock::_defaultState, set it to null.
2015-05-18 14:47:16 +08:00
f96e704f7d
Merge branch 'v3' into v3FrameBufferObject
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
2015-05-18 13:48:50 +08:00
02f295dfbf
fixed #11821 , after release StateBlock::_defaultState, set it to null, because developers would reconstruct it.
2015-05-18 10:44:49 +08:00
fbe49f538d
remove WP8 code which is added by accident when resolve merge conflicts
2015-05-15 10:06:44 +08:00
c994f28914
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
2015-05-15 09:55:51 +08:00
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
84540c1ff4
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-14 11:55:10 +08:00
57a3fa256a
Fix memory leak for FrameBufferObject
2015-05-14 11:19:13 +08:00
e6e0a1d15c
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
2015-05-14 10:36:49 +08:00
fde5f8d63c
Adds better sample
...
adds clone support as well
2015-05-13 17:39:39 -07:00
aeea7ade14
RenderState can be part of Material and Technique
2015-05-13 14:12:37 -07:00
e95de4de62
fixes mipmap issue with parsing Sampler
2015-05-13 10:24:32 -07:00
8311cf8920
Fix clearcolor overwrite bug
...
change test case for FrameBufferObject
2015-05-13 17:40:10 +08:00
6097b4ddd2
add clearAllFBOs function in FrameBufferObject
2015-05-13 17:17:54 +08:00
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +08:00
c693573d77
more samples
...
and API fixes
2015-05-12 22:24:52 -07:00
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
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
f0acf7ee7b
original version of frame buffer object
2015-05-12 16:43:17 +08:00
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
4d71175318
resove conflict
2015-05-12 12:12:29 +08:00
cc0b3ffd2e
Merge branch 'v3' into v3_addClearforCamera
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-12 09:49:15 +08:00
f25c02f230
fix bugs of terrain
2015-05-11 12:02:32 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
67ec758d15
add clear feature when before draw scene with a camera
2015-05-07 15:09:06 +08:00
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
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 f843466254a4b05671818b9a994fbd5f4e02199bf1cf177bbca1a95f0287b42fd3e38b425b2b65d5fa3dd54ddbdbc345548a160d7b409f20967f35a09c50c464c45fab648d1f0779d05
2015-05-05 13:07:32 -07:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
f64012d77b
special shaders for Windows Phone 8.1 with no gl_PointSprite
2015-04-29 09:47:44 -07:00
5f692962b9
fixed 'seperate' typo
...
issue #8408
2015-04-25 00:02:39 +03:00
f6276dd4b3
Merge pull request #10983 from perminovVS/v3-texture-init-check-error
...
Clean possible GL error init Texture2D
2015-04-21 09:50:54 +08:00
e02dad3489
fix ui grayscale shader memory release issue
2015-04-20 17:00:40 +08:00
8c8058a9be
merge cocos resolve conflict
2015-04-14 13:56:05 +08:00
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
0aef6b9446
Merge pull request #11295 from Almax27/v3
...
RenderQueue command buffer optimisation
2015-04-10 09:33:43 +08:00
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
9edfa5bb29
RenderQueue command buffer optimisation
...
Made _commands an array of vectors that is no longer reallocated every frame
Provided method to reallocate queues manually and reserve memory in order to minimise std::vector dynamic reallocation
2015-04-06 14:45:19 +01:00
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
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
e4ae88ef15
add new line at end of file
2015-04-03 09:11:09 +08:00
6c528c4a42
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
2015-03-30 15:51:01 +08:00
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
c6a86ac287
move shader to shaders
2015-03-30 13:45:50 +08:00
59441adc2c
Merge pull request #11213 from super626/texturecube
...
Texturecube bug fix
2015-03-30 10:48:10 +08:00
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
a1bad14c1e
Update ccShader_3D_Skybox.frag
2015-03-27 17:07:30 +08:00
0367d752af
Merge branch 'v3' into v3_comments
...
Conflicts:
cocos/renderer/ccShaders.h
2015-03-27 12:05:15 +08:00
3d657df9f6
[ci skip]add group base to files in renderer folder
2015-03-27 11:54:40 +08:00
d9680b2c74
Merge pull request #11178 from calfjohn/v3
...
[ci skip]fixed doxygen warning for physics and texture2d
2015-03-27 11:11:28 +08:00
49bf8d5e13
Merge pull request #11181 from dabingnn/v3_comments
...
V3 comments
2015-03-27 11:09:17 +08:00
24aef7c6bb
Merge pull request #11164 from super626/texturecube
...
Texturecube
2015-03-27 11:06:28 +08:00
cbcdef11c3
[ci skip]fix warning for doxygen
2015-03-27 11:05:01 +08:00
f18fac48ed
[ci skip]fix warning for doxygen
2015-03-27 11:03:21 +08:00
0af4f9f1ed
fixed doxygen warning for physics and texture2d
2015-03-27 10:34:01 +08:00
4eadd1ce47
Merge pull request #11165 from calfjohn/v3
...
[ci skip]Modify group name for physics and Texture2d, Texture2dCache, TextureAtla...
2015-03-26 15:29:17 +08:00
587931faaa
Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas.
2015-03-26 15:20:25 +08:00
84535feb0c
merge cocos
2015-03-26 11:59:26 +08:00
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
7f60b1cea2
Merge pull request #11078 from calfjohn/v3
...
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
2015-03-23 22:16:56 +08:00
044c954155
[ci skip] update comments CCGLGroupCommand.h
2015-03-23 21:36:01 +08:00
027106c9ee
[ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h
2015-03-23 21:19:02 +08:00
126186e413
[ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h
2015-03-23 20:30:37 +08:00
2dde1e69e3
Merge branch 'v3' into v3_comments
2015-03-23 20:00:31 +08:00
657f270855
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-03-23 17:50:53 +08:00
ff0e852044
Add document for Texture2D\TextureAtlas\TextureCache
2015-03-23 17:50:22 +08:00
27c4104ca7
Merge pull request #11049 from MSOpenTech/v3-wp8-shaders
...
Edit V3 updated precompiled shaders for WP8
2015-03-23 11:28:18 +08:00
dda85fcb02
Merge pull request #11027 from tangziwen/doc
...
add 3D doc, fixed typo
2015-03-23 10:45:41 +08:00
fc94659fd5
updated precompiled shaders for WP8
2015-03-20 23:50:48 -07:00
814490ab44
add 3D doc, fixed typo
2015-03-20 17:20:22 +08:00
abaa8dba77
update comments
2015-03-20 11:24:52 +08:00
d075a2bf86
Merge pull request #11009 from dabingnn/v3_comments
...
[ci skip] update comments in renderer folder
2015-03-20 09:47:30 +08:00
055b71569a
[ci skip] update comments in renderer folder
2015-03-20 09:46:08 +08:00
1b179c2b02
Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h
2015-03-19 20:20:16 +08:00
133be7e57f
Clean possible GL error
...
CHECK_GL_ERROR_DEBUG work debug only.
Clean need for correct check glTexImage2D and glCompressedTexImage2D
Release now work: If gl error before any code, initWithMipmaps return
false always
2015-03-19 11:10:49 +03:00
0c8218581f
[ci skip] update comments CCRenderCommand.h
2015-03-18 20:30:52 +08:00
431b3593a7
[ci skip] update comments CCQuadCommand.h
2015-03-18 20:12:34 +08:00
a87c5755e9
[ci skip] update comments CCTrianglesCommand.h
2015-03-18 19:52:08 +08:00
4ae4500a68
[ci skip]adjust comments
2015-03-18 19:32:10 +08:00
fb1d9899c7
[ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h
2015-03-18 17:40:10 +08:00
a71fb9f946
[ci skip]update comments CCVertexIndexBuffer.h
2015-03-18 17:18:25 +08:00
eb2786f40d
[ci skip]update comments CCVertexIndexData.h
2015-03-18 14:43:44 +08:00
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
73caf536da
fix the bug of lighting shader
2015-03-17 16:43:08 +08:00
08ceae3de2
removed no-gl_PointSize shaders for Windows Phone 8.1
2015-03-16 08:08:02 -07:00
8b3e116ed6
check running scene
2015-03-16 18:04:50 +08:00
874f7c7f99
fix transparent render bug
2015-03-03 10:42:47 +08:00
9b117bf87c
resolve conflict
2015-02-13 15:46:19 +08:00
2789ad1393
remove unused code
2015-02-13 09:48:27 +08:00
a2ef1abef3
Fixed unwanted changes
2015-02-12 23:07:24 +01:00
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
7f28230311
Fixed merge error
2015-02-10 21:37:18 +01:00
00edc542cb
Merged with upstream/v3
...
Merged with upstream/v3 and resolved merge conflicts
2015-02-10 21:27:20 +01:00
2ac0b35283
fix render state
2015-02-06 10:09:23 +08:00
e9b4e4e19c
Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:59 -08:00
07cda0db37
Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:31 -08:00
806a5011e5
solve the problems noted in comments
2015-01-30 17:23:30 +08:00
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
f914297703
Fix force depth write logic
2015-01-28 23:55:26 -08:00
2f04e7a6ac
Merge pull request #10239 from super626/v3
...
fix bug on uniform cache
2015-01-29 10:13:11 +08:00
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +08:00
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
c0ff8d1177
Don't clear depth between queues
2015-01-28 15:28:14 -08:00
c8a783e4ac
use const auto&
2015-01-28 10:59:29 +08:00
5f5c00b7d2
remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE
2015-01-28 10:32:22 +08:00
be6ca1b6d2
add force depth write
2015-01-27 17:05:51 -08:00
c364323bbc
Not using static value to save previous render state since other commands like custom command could change them
2015-01-27 16:26:31 -08:00
8f539a0107
Make PositionZ independent from global Z
2015-01-27 15:41:58 -08:00
b89e255099
Finish organize the render queue
2015-01-27 14:41:16 -08:00
78d8a694c8
Merge branch 'v3' into v3_fixRenderer
...
Conflicts:
cocos/renderer/CCRenderer.cpp
cocos/renderer/CCRenderer.h
2015-01-27 11:23:48 -08:00
3c635d044e
Add Queue_count for render queues
2015-01-27 11:12:51 -08:00
220b34d105
Merge branch 'newcode' into v3
2015-01-27 16:35:54 +08:00
fad8f9f1da
format
2015-01-27 16:31:15 +08:00
af8a6c16b1
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-01-27 16:24:07 +08:00
57970da398
Do some optimize
2015-01-27 15:50:05 +08:00
a38b210803
add depth in renderCommand
...
refactor rendering order of renderQueue
2015-01-27 14:29:09 +08:00
15adaf2877
save/restore render state
2015-01-26 16:37:11 -08:00
bb419719aa
fix bug: about caching uniform.
2015-01-26 18:40:00 +08:00
285a280bb4
enable attribute cache as before
2015-01-23 18:19:25 +08:00
421310f3a8
Merge branch 'v3' into v3_fixCrashNoVAO
...
Conflicts:
cocos/renderer/ccGLStateCache.cpp
2015-01-23 14:50:21 +08:00
550fc44187
disbale cache for s_attributeFlags
2015-01-23 14:32:36 +08:00
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
0ca47ab40f
fix crash for textureAtlas
2015-01-21 14:14:53 +08:00
yangxiao