Dale Stammen
414a34f3f9
removed old WP8.1 shaders for gl_PointSize
2015-10-16 14:47:02 -07:00
Sebastien Flory
bd83fc1474
PMA Handling issue
...
Hi,
I compared to cocos2D-x v2.x and it seems that there is an issue with the _hasPremultipliedAlpha flag not beeing set correctly for mipmaps and compressed textures.
I guess it's a mistake due to the reorganization of the code between the old CCTexture2D and the new one.
In our tests, this fixes the issue.
Best,
Sebastien
2015-10-15 15:48:21 +02:00
yangxiao
907189ed14
correct wrong presion, which leads to failed on some devices
2015-10-15 11:59:38 +08:00
Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
yangxiao
ea538cd9da
merge cocos
2015-09-16 10:37:24 +08:00
yangxiao
ca24e6eba3
fix clone
2015-09-11 15:08:59 +08:00
yangxiao
6fd9784fce
setParent for RenderState
2015-09-11 11:47:36 +08:00
yangxiao
d5fab0bd38
merge cocos
2015-09-10 10:44:09 +08:00
yangxiao
8f5cd6cdc8
remove setParent
2015-09-10 09:28:01 +08:00
yangxiao
64471fab85
fix material clone
2015-09-10 09:23:02 +08:00
Nathanael Weiss
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
yangxiao
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
yangxiao
137d180dc9
fix material clone
2015-09-07 13:59:08 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
yangxiao
bc07d7954a
fix render state
2015-08-28 23:00:45 +08:00
pandamicro
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
Ricardo Quesada
d5d1be93cc
make it compile on win32
2015-08-26 10:16:50 -07:00
yangxiao
d17c04cf0e
tmp
2015-08-26 16:35:42 +08:00
Ricardo Quesada
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
yangxiao
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
fusijie
cbd7eed9c4
fixed renderTexture crash bug.
2015-08-21 17:38:56 +08:00
yangxiao
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00
pandamicro
a011fa4c8a
Merge pull request #12852 from super626/issue10242
...
fix #10242 , reload shader when light number changed
2015-07-30 12:57:32 +08:00
tangziwen
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
yangxiao
92ec9ab5f2
add config loaded event
2015-07-24 16:38:30 +08:00
andyque
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
yangxiao
69e79ed164
fix #10242 , reload shader when light number changed
2015-07-15 11:36:53 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
Vincent Yang
d9bc8b7c1b
fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback.
2015-07-09 17:06:55 +08:00
Vincent Yang
1f8b46e911
Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync.
2015-07-08 15:13:48 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
yangxiao
13dbd44250
remove unused variable
2015-06-25 15:05:21 +08:00
yangxiao
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
pandamicro
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
pandamicro
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
pandamicro
2a0c2b6e32
Merge pull request #12250 from hawkwood/patch-10
...
Fails if file does not exist
2015-06-23 17:32:47 +08:00
andyque
7fff2bd3c4
fix nine patch image parser error on Windows.
2015-06-23 15:42:58 +08:00
Vincent Yang
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
pandamicro
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
Justin Hawkwood
90db6fe5d6
Added check that callback is set
2015-06-15 23:36:04 -07:00
Justin Hawkwood
9378b6704c
Moved file check to alternate location
2015-06-15 23:31:52 -07:00
Huabing.Xu
19982aae00
fix android background and foreground bug with VertexAttributeBinding
2015-06-16 14:04:50 +08:00
Ricardo Quesada
b167ab3e78
StateBlock() is public
2015-06-15 17:43:37 -07:00
Ricardo Quesada
ca3da86da7
StateBlock::restore() is public
...
It is possible to restore to default state
2015-06-15 14:12:44 -07:00
pandamicro
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
Ricardo Quesada
5c419ff7bc
compiles on windows
2015-06-12 20:49:20 -07:00
Ricardo Quesada
9b7c12aa38
updates invalidate documentation
2015-06-12 17:44:48 -07:00
Ricardo Quesada
a8cf72dc43
pass bits to invalidate
2015-06-12 17:14:09 -07:00
Ricardo Quesada
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
Vincent Yang
097bf455c2
Rename CCRenderBufferObject to CCRenderBuffer in windows projects.
2015-06-11 11:45:10 +08:00
Huabing.Xu
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
Justin Hawkwood
852639cfe7
Added empty string check
2015-06-09 09:19:04 -07:00
Huabing.Xu
67a94c4485
compiles on android and linux
2015-06-09 17:57:07 +08:00
Huabing.Xu
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
Huabing.Xu
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
Huabing.Xu
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
Justin Hawkwood
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
Michael Sotnikov
dae8f788c1
improve rendering of inner shapes when outline is used
2015-06-08 12:56:43 +03:00
Huabing.Xu
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
Ricardo Quesada
453a3d93bc
samplers are treated as uniforms
2015-06-05 14:55:33 -07:00
Huabing.Xu
d35a8a3a9e
add default FBO
2015-06-04 15:53:13 +08:00
Huabing.Xu
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
Ricardo Quesada
b8957b176a
fixes win compilation issues
2015-06-02 23:31:57 -07:00
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
linshun
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
Huabing.Xu
9bf15877e5
add applyViewport in camera.
2015-05-29 15:52:06 +08:00
Huabing.Xu
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
Huabing.Xu
2d6d1b7a8c
add android background and foreground switch support for framebufferobject
2015-05-28 17:08:36 +08:00
Huabing.Xu
9ffbe39f18
DepthStencil RenderTarget could be null, which can be used to detach the old DepthStencil RenderTarget
2015-05-27 18:16:05 +08:00
Huabing.Xu
9d4e50f3a5
add optional params for RenderTarget creation
2015-05-27 16:59:54 +08:00
Huabing.Xu
471547e0b0
refactor FrameBufferObject to FrameBufferObject and RenderTarget
2015-05-27 11:40:12 +08:00
Vincent Yang
246913c092
Fix bug: skybox can't move to other position except origin point in world space.
2015-05-26 17:14:26 +08:00
Huabing.Xu
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
Huabing.Xu
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
minggo
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
WenhaiLin
234ad668ec
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
2015-05-25 11:47:37 +08:00
andyque
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
Ricardo Quesada
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
Ricardo Quesada
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
Ricardo Quesada
aa027fbe0f
Properties fixes
...
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
2015-05-19 13:51:52 -07:00
Vincent Yang
8d3ade78ca
Add CC_DLL to Class FrameBufferObject.
2015-05-19 13:50:10 +08:00
Huabing.Xu
75f740add5
linux works
2015-05-18 18:08:15 +08:00
minggo
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
Huabing.Xu
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
walzer
02f295dfbf
fixed #11821 , after release StateBlock::_defaultState, set it to null, because developers would reconstruct it.
2015-05-18 10:44:49 +08:00
Huabing.Xu
fbe49f538d
remove WP8 code which is added by accident when resolve merge conflicts
2015-05-15 10:06:44 +08:00
Huabing.Xu
c994f28914
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
2015-05-15 09:55:51 +08:00
Ricardo Quesada
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
Huabing.Xu
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
Huabing.Xu
57a3fa256a
Fix memory leak for FrameBufferObject
2015-05-14 11:19:13 +08:00
Huabing.Xu
e6e0a1d15c
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
2015-05-14 10:36:49 +08:00
Ricardo Quesada
fde5f8d63c
Adds better sample
...
adds clone support as well
2015-05-13 17:39:39 -07:00
Ricardo Quesada
aeea7ade14
RenderState can be part of Material and Technique
2015-05-13 14:12:37 -07:00
Ricardo Quesada
e95de4de62
fixes mipmap issue with parsing Sampler
2015-05-13 10:24:32 -07:00
Huabing.Xu
8311cf8920
Fix clearcolor overwrite bug
...
change test case for FrameBufferObject
2015-05-13 17:40:10 +08:00
Huabing.Xu
6097b4ddd2
add clearAllFBOs function in FrameBufferObject
2015-05-13 17:17:54 +08:00
Huabing.Xu
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +08:00
Ricardo Quesada
c693573d77
more samples
...
and API fixes
2015-05-12 22:24:52 -07:00
Ricardo Quesada
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
Ricardo Quesada
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
minggo
a587b28e38
Merge pull request #11792 from super626/v3
...
particle3d can not be seen when added to scene with terrain
2015-05-13 09:38:21 +08:00
Huabing.Xu
f0acf7ee7b
original version of frame buffer object
2015-05-12 16:43:17 +08:00
Ricardo Quesada
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
yangxiao
4d71175318
resove conflict
2015-05-12 12:12:29 +08:00
Huabing.Xu
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
songchengjiang
f25c02f230
fix bugs of terrain
2015-05-11 12:02:32 +08:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
Huabing.Xu
67ec758d15
add clear feature when before draw scene with a camera
2015-05-07 15:09:06 +08:00
Ricardo Quesada
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
Ricardo Quesada
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 09:51:02 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 17:05:49 2015 -0700
Material system works Ok.
Deftaul states are being applyied to RenderState::StateBlock::_default
state as well!
commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 15:52:09 2015 -0700
more fixes for material
blending works as expected
commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 12:14:00 2015 -0700
compiles on Android
compiles on Android
commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 11:01:46 2015 -0700
Cmakefiles
works with Cmake again
commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 2 18:17:50 2015 -0700
Particle3D working Ok with its own uniforms
commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 17:32:00 2015 -0700
MeshCommand now works 100% on Material!
commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 15:49:14 2015 -0700
multiple meshes work Ok
commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 13:43:56 2015 -0700
Adds `clone` to GLProgramState
commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:54:34 2015 -0700
adds comment about the glprogramstate bug
commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:28:39 2015 -0700
some uniforms moved to Material
commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 16:52:07 2015 -0700
depth test moved to Material!
commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 13:12:28 2015 -0700
Material/Technique/Pass subclass of RenderState
Inheritance of RenderState. Code from GamePlay3D
commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 12:05:26 2015 -0700
same as v3
commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 11:37:40 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 18:02:21 2015 -0700
fixes on blending
commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:51:05 2015 -0700
better defaults for StateBlock
commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:46:36 2015 -0700
RenderState::bind() binds lots of states
commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:40:07 2015 -0700
Adds REnderState parsing in .material
commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:06:31 2015 -0700
RenderState added into RenderState
Code based on GamePlay3D. Adds GamePlay3d License.
commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 11:27:55 2015 -0700
Merge branch 'v3' into material_system
commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 18:15:12 2015 -0700
order files alphabetically
order files alphabetically
commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 17:46:07 2015 -0700
Adds cmake and android support
commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 16:33:50 2015 -0700
for some reason the callback was crashing
... bug in the callback code?
in any case, we didn't need it and it was making the code slower.
commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 14:00:24 2015 -0700
more little fixes
commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 12:11:28 2015 -0700
MeshCommand using Material internally
works
commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 10:34:03 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 17:41:27 2015 -0700
improved readebility of MeshCommand code
commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 15:41:07 2015 -0700
mesh supports Material
`Mesh` supports `Material`
Now `MeshCommand` needs to implement it correctly.
commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 11:23:28 2015 -0700
Merge branch 'v3' into material_system
commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 17:40:48 2015 -0700
Adding Material into Mesh
WIP.
commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:39:54 2015 -0700
cosmetic
commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:26:41 2015 -0700
moves even more code form Sprite3D to Mesh
commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:15:21 2015 -0700
Moves "draw" from `Sprite3D` to `Mesh`
commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 15:00:50 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 14:46:28 2015 -0700
cosmetic
commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 16:44:21 2015 -0700
revert my changes...
...actually the GLProgramState code was Ok... ouch
commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 15:40:54 2015 -0700
parsing GLProgramState validates the attributes
commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 12:10:31 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 17:45:34 2015 -0700
little progress on Sprite3D + Material
GLProgramState needs to decouple Uniforms from Attributes in
`applyGLProgram`.
binding the attributes is something that needs to be done
at a different order.
Perhaps the attributes are part of a VAO or something else.
the method `applyAttributes()` has a variable to avoid that...
but everything looks very hackish.
commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 15:46:02 2015 -0700
doesn't crash :)
but doesn't show anything either
commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 13:35:45 2015 -0700
adding sprit3d test
commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 12:10:32 2015 -0700
MeshCommand: initial draw with Material
commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 10:41:05 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 21:57:28 2015 -0700
adding Material to MeshCommand
commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 19:39:09 2015 -0700
pre commit before merging MeshCommand
commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 18:19:00 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:22:03 2015 -0700
Pass conforms to create()/init() pattern
commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:04:19 2015 -0700
defines are strings
better error checking when creating objects
autorelase added in Pass, Material, Technique
commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 11:23:47 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:31:37 2015 -0700
blur effect works with alpha
commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:35 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:07 2015 -0700
Material, Technique, Pass: they have parent
commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 21:48:06 2015 -0700
multipass works
commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:31:04 2015 -0700
yeah!
more materials... a lot to do yet
commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:06:46 2015 -0700
yeah! works!
commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 16:43:54 2015 -0700
simple test of material system works!!!
commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 13:51:45 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 18:04:23 2015 -0700
JSON file curated
fixes minor bugs
commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 17:22:36 2015 -0700
parsers shaders!
including uniforms
commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 23:24:18 2015 -0700
Material parses texture
commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 18:22:33 2015 -0700
material parsing almost working
commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 09:23:23 2015 -0700
Merge branch 'v3' into material_system
commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 18:42:42 2015 -0700
json parsing broken
ha... I need to parse the content of the file, to the name of the file.
to be fixed tomorrow
commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 10:19:11 2015 -0700
Merge branch 'v3' into material_system
commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:41:12 2015 -0700
Adds more dummy files for material
commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:01:16 2015 -0700
adds empty test
commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 15:36:24 2015 -0700
more material fixes
multiple passes added in renderer
commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 11:52:30 2015 -0700
Merge branch 'v3' into material_system
commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:42:35 2015 -0700
Merge branch 'v3' into material_system
commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:18:34 2015 -0700
Merge branch 'cpp_compiles_on_mac' into material_system
commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:09:59 2015 -0700
compiles on Mac
commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 13:54:59 2015 -0700
Merge branch 'v3' into material_system
commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 8 14:16:27 2015 -0700
Merge branch 'v3' into material_system
commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:15:28 2015 +0800
Merge branch 'v3' into material_system
commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:13:24 2015 +0800
little changes to pass
commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:36:43 2015 +0800
Merge branch 'v3' into material_system
commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:23:17 2015 +0800
small changes
commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Mar 26 18:20:46 2015 -0700
initial Material system
2015-05-05 13:07:32 -07:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
Dale Stammen
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
Dale Stammen
f64012d77b
special shaders for Windows Phone 8.1 with no gl_PointSprite
2015-04-29 09:47:44 -07:00
Danut Chereches
5f692962b9
fixed 'seperate' typo
...
issue #8408
2015-04-25 00:02:39 +03:00
minggo
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
andyque
e02dad3489
fix ui grayscale shader memory release issue
2015-04-20 17:00:40 +08:00
yangxiao
8c8058a9be
merge cocos resolve conflict
2015-04-14 13:56:05 +08:00
zhukaixy
6684491249
1: update cube texture for sky box
...
2: add mouse-controled camera for test case (skybox)
2015-04-14 01:39:23 +08:00
minggo
0aef6b9446
Merge pull request #11295 from Almax27/v3
...
RenderQueue command buffer optimisation
2015-04-10 09:33:43 +08:00
minggo
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
Aaron Baumbach
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
Vladimir Perminov
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
tangziwen
0193420dfc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
...
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-04-03 15:45:51 +08:00
tangziwen
e4ae88ef15
add new line at end of file
2015-04-03 09:11:09 +08:00
samuele3hu
6c528c4a42
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
2015-03-30 15:51:01 +08:00
samuele3hu
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
yangxiao
c6a86ac287
move shader to shaders
2015-03-30 13:45:50 +08:00
minggo
59441adc2c
Merge pull request #11213 from super626/texturecube
...
Texturecube bug fix
2015-03-30 10:48:10 +08:00
minggo
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
zhukaixy
a1bad14c1e
Update ccShader_3D_Skybox.frag
2015-03-27 17:07:30 +08:00
Huabing.Xu
0367d752af
Merge branch 'v3' into v3_comments
...
Conflicts:
cocos/renderer/ccShaders.h
2015-03-27 12:05:15 +08:00
Huabing.Xu
3d657df9f6
[ci skip]add group base to files in renderer folder
2015-03-27 11:54:40 +08:00
minggo
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
Huabing.Xu
49bf8d5e13
Merge pull request #11181 from dabingnn/v3_comments
...
V3 comments
2015-03-27 11:09:17 +08:00
minggo
24aef7c6bb
Merge pull request #11164 from super626/texturecube
...
Texturecube
2015-03-27 11:06:28 +08:00
Huabing.Xu
cbcdef11c3
[ci skip]fix warning for doxygen
2015-03-27 11:05:01 +08:00
Huabing.Xu
f18fac48ed
[ci skip]fix warning for doxygen
2015-03-27 11:03:21 +08:00
calfjohn
0af4f9f1ed
fixed doxygen warning for physics and texture2d
2015-03-27 10:34:01 +08:00
minggo
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
calfjohn
587931faaa
Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas.
2015-03-26 15:20:25 +08:00
yangxiao
84535feb0c
merge cocos
2015-03-26 11:59:26 +08:00
WenhaiLin
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
WenhaiLin
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
minggo
7f60b1cea2
Merge pull request #11078 from calfjohn/v3
...
[ci skip] Add documents for Texture2D\TextureAtlas\TextureCache
2015-03-23 22:16:56 +08:00
Huabing.Xu
044c954155
[ci skip] update comments CCGLGroupCommand.h
2015-03-23 21:36:01 +08:00
Huabing.Xu
027106c9ee
[ci skip] update comments CCGLProgramStateCache.h, CCPrimitive.h CCPrimitiveCommand.h
2015-03-23 21:19:02 +08:00
Huabing.Xu
126186e413
[ci skip]update comments CCMathBase.h CCGLProgramState.h CCRenderer.h
2015-03-23 20:30:37 +08:00
Huabing.Xu
2dde1e69e3
Merge branch 'v3' into v3_comments
2015-03-23 20:00:31 +08:00
calfjohn
657f270855
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-03-23 17:50:53 +08:00
calfjohn
ff0e852044
Add document for Texture2D\TextureAtlas\TextureCache
2015-03-23 17:50:22 +08:00
minggo
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
minggo
dda85fcb02
Merge pull request #11027 from tangziwen/doc
...
add 3D doc, fixed typo
2015-03-23 10:45:41 +08:00
Dale Stammen
fc94659fd5
updated precompiled shaders for WP8
2015-03-20 23:50:48 -07:00
tangziwen
814490ab44
add 3D doc, fixed typo
2015-03-20 17:20:22 +08:00
Huabing.Xu
abaa8dba77
update comments
2015-03-20 11:24:52 +08:00
Huabing.Xu
d075a2bf86
Merge pull request #11009 from dabingnn/v3_comments
...
[ci skip] update comments in renderer folder
2015-03-20 09:47:30 +08:00
Huabing.Xu
055b71569a
[ci skip] update comments in renderer folder
2015-03-20 09:46:08 +08:00
dingpinglv
1b179c2b02
Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h
2015-03-19 20:20:16 +08:00
Vladimir Perminov
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
Huabing.Xu
0c8218581f
[ci skip] update comments CCRenderCommand.h
2015-03-18 20:30:52 +08:00
Huabing.Xu
431b3593a7
[ci skip] update comments CCQuadCommand.h
2015-03-18 20:12:34 +08:00
Huabing.Xu
a87c5755e9
[ci skip] update comments CCTrianglesCommand.h
2015-03-18 19:52:08 +08:00
Huabing.Xu
4ae4500a68
[ci skip]adjust comments
2015-03-18 19:32:10 +08:00
Huabing.Xu
fb1d9899c7
[ci skip]adjust comments CCVertexIndexBuffer.h and CCVertexIndexData.h
2015-03-18 17:40:10 +08:00
Huabing.Xu
a71fb9f946
[ci skip]update comments CCVertexIndexBuffer.h
2015-03-18 17:18:25 +08:00
Huabing.Xu
eb2786f40d
[ci skip]update comments CCVertexIndexData.h
2015-03-18 14:43:44 +08:00
minggo
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
songchengjiang
73caf536da
fix the bug of lighting shader
2015-03-17 16:43:08 +08:00
Dale Stammen
08ceae3de2
removed no-gl_PointSize shaders for Windows Phone 8.1
2015-03-16 08:08:02 -07:00
yangxiao
8b3e116ed6
check running scene
2015-03-16 18:04:50 +08:00
yangxiao
874f7c7f99
fix transparent render bug
2015-03-03 10:42:47 +08:00
yangxiao
9b117bf87c
resolve conflict
2015-02-13 15:46:19 +08:00
yangxiao
2789ad1393
remove unused code
2015-02-13 09:48:27 +08:00
kompjoefriek
a2ef1abef3
Fixed unwanted changes
2015-02-12 23:07:24 +01:00
yangxiao
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
KompjoeFriek
7f28230311
Fixed merge error
2015-02-10 21:37:18 +01:00
kompjoefriek
00edc542cb
Merged with upstream/v3
...
Merged with upstream/v3 and resolved merge conflicts
2015-02-10 21:27:20 +01:00
yangxiao
2ac0b35283
fix render state
2015-02-06 10:09:23 +08:00
Nite Luo
e9b4e4e19c
Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:59 -08:00
Nite Luo
07cda0db37
Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:31 -08:00
zhukaixy
806a5011e5
solve the problems noted in comments
2015-01-30 17:23:30 +08:00
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
Nite Luo
f914297703
Fix force depth write logic
2015-01-28 23:55:26 -08:00
minggo
2f04e7a6ac
Merge pull request #10239 from super626/v3
...
fix bug on uniform cache
2015-01-29 10:13:11 +08:00
zhukaixy
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +08:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
Nite Luo
c0ff8d1177
Don't clear depth between queues
2015-01-28 15:28:14 -08:00
Huabing.Xu
c8a783e4ac
use const auto&
2015-01-28 10:59:29 +08:00
Huabing.Xu
5f5c00b7d2
remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE
2015-01-28 10:32:22 +08:00
Nite Luo
be6ca1b6d2
add force depth write
2015-01-27 17:05:51 -08:00
Nite Luo
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
Nite Luo
8f539a0107
Make PositionZ independent from global Z
2015-01-27 15:41:58 -08:00
Nite Luo
b89e255099
Finish organize the render queue
2015-01-27 14:41:16 -08:00
Nite Luo
78d8a694c8
Merge branch 'v3' into v3_fixRenderer
...
Conflicts:
cocos/renderer/CCRenderer.cpp
cocos/renderer/CCRenderer.h
2015-01-27 11:23:48 -08:00
Nite Luo
3c635d044e
Add Queue_count for render queues
2015-01-27 11:12:51 -08:00
yangxiao
220b34d105
Merge branch 'newcode' into v3
2015-01-27 16:35:54 +08:00
yangxiao
fad8f9f1da
format
2015-01-27 16:31:15 +08:00
yangxiao
af8a6c16b1
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-01-27 16:24:07 +08:00
lvlong
57970da398
Do some optimize
2015-01-27 15:50:05 +08:00