mogemimi
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
Huabing.Xu
e8acf38212
fix animate 3d bug
2016-05-09 15:21:19 +08:00
TAKEDA Yutaka
d17fdfe3cc
CCSprite::createNode bug fix.
2016-05-09 15:42:39 +09:00
minggo
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
mogemimi
d2c46167c3
Fix compiler warning C4804 under Visual Studio
2016-04-25 10:46:33 +09:00
NamJunHyone
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
mogemimi
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
tomi-payne
fbadcf188a
Update CCSprite3D.cpp
...
Fixed Sprite3DCache::removeSprite3DData error
2016-04-19 10:11:29 +08:00
Steve Tranby
24fd25e143
Iterator erase pattern
2016-04-01 18:29:21 -06:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
Wenhai Lin
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
James Chen
b04e4754d7
Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now.
2016-01-15 00:55:10 +08:00
pandamicro
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
XiaoYang
593a619dc8
Merge pull request #14715 from liamcindy/v3_textureCache
...
update for 3D object render, revert old changes
2015-12-18 21:22:31 +08:00
Liam
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
Wenhai Lin
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
XiaoYang
d904246aa8
Merge pull request #14613 from super626/v3
...
fix 3d model bug
2015-12-14 10:04:25 +08:00
mogemimi
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
yangxiao
6e1f38fdc4
fxi model bug
2015-12-08 16:32:06 +08:00
pandamicro
6ff2586f26
Merge pull request #14574 from super626/v3
...
Fix Sprite3D::setMaterial when multiple meshes exist
2015-12-04 17:38:56 +08:00
Ricardo Quesada
f6c2758801
Merge pull request #14409 from xiaofeng11/v3_combine_opengl
...
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -08:00
yangxiao
8d546828f4
fix Sprite3D::setMaterial
2015-12-04 10:54:43 +08:00
Shun Lin
d0ce2473a1
Merge pull request #14499 from xiaofeng11/v3_combine_safety
...
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
Liam
07bc48c1b8
revert glprogram
2015-12-03 16:29:02 +08:00
yangxiao
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
xiaofeng11
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
yangxiao
54e13c3acd
update comment
2015-12-01 17:47:34 +08:00
yangxiao
23f03bc65f
update comment
2015-12-01 10:47:25 +08:00
yangxiao
11f1bd6e28
builtin material normal map support
2015-12-01 10:37:53 +08:00
Liam
4d379ed9bd
revert ccplane
2015-11-30 14:53:37 +08:00
Liam
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
XiaoFeng
71871bacf9
Add aabb dirty mark when load from file
2015-11-27 15:53:26 +08:00
XiaoFeng
2d28b78e41
Add 3 missing class export
...
Change clearShader logic.
2015-11-27 14:58:18 +08:00
XiaoFeng
a61fe711e2
Update
2015-11-27 14:01:43 +08:00
XiaoFeng
f5f09133e6
Change ASSERT to safety mode
2015-11-26 16:49:01 +08:00
XiaoFeng
09606e96cd
Add comment for new function
2015-11-25 11:33:24 +08:00
XiaoFeng
d0cd640ac8
Update
2015-11-25 11:15:17 +08:00
songchengjiang
9241797acb
support normal mapping material
2015-11-25 10:45:03 +08:00
XiaoFeng
722f20c4b6
Update implement remove condition macro check.
2015-11-24 18:29:58 +08:00
yangxiao
1ac82fa273
fix terrain ray trace bug when there is offset
2015-11-24 15:13:52 +08:00
XiaoFeng
eb644ee79f
Combine Studio change for 3d components
2015-11-16 15:05:43 +08:00
yangxiao
39a6f1e8f1
char* to string
2015-11-12 18:08:29 +08:00
yangxiao
3016bf696a
fix updateVerticesForLOD
2015-11-05 15:18:46 +08:00
yangxiao
16a79ed9df
function genMaterial keeps old state block
2015-11-04 11:10:28 +08:00
yangxiao
11f5e6cf96
setGLProgramState should not modify state block
2015-10-29 14:22:13 +08:00
yangxiao
a4d67867d7
check light enable or not when switching shader
2015-10-20 15:11:39 +08:00
yangxiao
d6eb1b938f
correct spot light init value
2015-10-08 11:27:02 +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
36d4f5564d
merge cocos
2015-09-18 14:08:33 +08:00
pandamicro
3f5df0ccc3
Merge pull request #13647 from super626/motionstreak3d
...
Motionstreak3d
2015-09-18 11:59:33 +08:00
yangxiao
6f1b04fd89
merge cocos
2015-09-18 09:37:26 +08:00
yangxiao
256832d000
replace genGLProgramState to genMaterial
2015-09-17 14:45:16 +08:00
yangxiao
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
yangxiao
fb7ade6578
reset set material
2015-09-16 18:08:23 +08:00
yangxiao
b5e69930cd
fix shader light parameter
2015-09-16 18:04:52 +08:00
yangxiao
d5fab0bd38
merge cocos
2015-09-10 10:44:09 +08:00
Martin Taylor
e592a1a02d
fix typos
2015-09-09 11:37:41 +08:00
yangxiao
153bdb7170
add comment
2015-09-09 11:11:17 +08:00
yangxiao
f944750627
add material cache
2015-09-08 15:29:54 +08:00
yangxiao
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
yangxiao
97c59c87ac
built in material for sprite3d
2015-09-07 13:59:38 +08:00
songchengjiang
addce6c565
add CC_DLL
2015-09-02 15:55:58 +08:00
yangxiao
c23805889f
add motionstreak3d
2015-09-01 11:02:22 +08:00
yangxiao
b6c4f4cf50
add comment
2015-09-01 10:39:14 +08:00
yangxiao
030ab8858d
enable depth write for transparent object
2015-08-31 18:34:09 +08:00
yangxiao
bc07d7954a
fix render state
2015-08-28 23:00:45 +08:00
yangxiao
bc2e66d03b
add motionstreak3d
2015-08-28 11:40:12 +08:00
yangxiao
7884138dcc
disable blend when drawing skybox
2015-08-25 14:32:25 +08:00
yangxiao
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
yangxiao
8f81267960
skybox is not transparent
2015-08-19 18:25:34 +08:00
pandamicro
dbd0b6dd86
Merge pull request #13272 from yangws/bug_21800
...
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
Vincent Yang
354f64ec51
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.
2015-08-07 17:36:35 +08:00
Vladimir Perminov
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
yangxiao
fc4c25c51e
add comment
2015-08-03 13:30:30 +08:00
yangxiao
b6774a5f44
fix warning
2015-08-03 10:27:57 +08:00
yangxiao
929cd4fbfe
set default value for _lightDir
2015-08-03 10:12:04 +08:00
yangxiao
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00
pandamicro
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
jianglong0156
dcda083efa
rename the initTerrain to initWithTerrainData
2015-07-31 18:35:47 +08:00
jianglong0156
4439b02a84
rename the init function name
2015-07-31 15:21:54 +08:00
jianglong0156
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
pandamicro
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
tangziwen
cee43ccebb
update terrain again
2015-07-29 14:32:36 +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
pandamicro
4cd0ced683
Merge pull request #12805 from super626/animate3d
...
fix #11487 animate3d bugs
2015-07-29 11:09:03 +08:00
pandamicro
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
pandamicro
89c722ed4b
Add script invocation for onEnter, onExit etc in other classes
2015-07-28 16:07:14 +08:00
yangxiao
ef49e5a169
merge cocos
2015-07-17 17:43:32 +08:00
yangxiao
bf20145e35
animate3d callback and test
2015-07-17 11:08:27 +08:00
songchengjiang
282dc23bb2
modify interfaces of Animate3DCallback
2015-07-15 17:34:14 +08:00
songchengjiang
6c83e8d81c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
yangxiao
8598c5037e
fix #11487 animate3d bugs
2015-07-13 16:10:48 +08:00
songchengjiang
5a16748273
optimize Animate3DCallback
...
add Animate3DCallbackTest
2015-07-13 11:43:13 +08:00
songchengjiang
a1dd466588
modify Animate3D keyFrameCallback
2015-07-10 15:50:09 +08:00
yangxiao
c4587ecda1
if has normal use the shader with normal
2015-07-10 11:44:20 +08:00
songchengjiang
a1956e2210
fix issue#9310 issue#10151 issue#12551
2015-07-09 18:05:47 +08:00
yangxiao
97a17cdc8a
program created dummy texture instead of empty texture
2015-07-08 17:00:01 +08:00
yangxiao
f7cdd7162b
adapter according to latest objloader
2015-07-08 15:33:43 +08:00
yangxiao
dac84ade0d
index to short
2015-07-08 14:03:53 +08:00
yangxiao
40b33604d8
adjust objloader to cocos
2015-07-08 13:44:15 +08:00
yangxiao
fdd78ef73f
update objloader to latest
2015-07-08 13:42:14 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
Ricardo Quesada
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro
e7c6ae7b13
Merge pull request #12637 from super626/skybox
...
Set Texturecube tex parameter to clamp to edge
2015-07-02 18:34:38 +08:00
songchengjiang
da5e077b55
texture set GL_CLAMP_TO_EDGE
2015-07-01 18:06:17 +08:00
Vincent Yang
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
yangxiao
52daa2234c
add setForce2DQueue
2015-07-01 14:24:22 +08:00
yangxiao
f4a81f0e53
optimize draw
2015-06-25 15:14:44 +08:00
yangxiao
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
yangxiao
77f1af91f9
opt getIntersectionPoint
2015-06-24 15:49:09 +08:00
yangxiao
086b01321c
code simplify
2015-06-24 14:10:38 +08:00
yangxiao
7546bfe9af
make getChunkByIndex protected
2015-06-24 10:56:46 +08:00
yangxiao
d1baacdf8a
fix terrain ray trace
2015-06-24 10:49:18 +08:00
yangxiao
bfdb06e31b
add empty line
2015-06-23 18:31:20 +08:00
yangxiao
251c81d7be
Merge branch 'newcode' into v3
2015-06-23 18:25:41 +08:00
XiaoYang
59e6b6fdc2
Merge pull request #352 from tangziwen/v3
...
Using ray-triangle intersect test instead of the newton method
2015-06-23 16:30:18 +08:00
tangziwen
5b857f7d66
fix some bug
2015-06-23 16:11:00 +08:00
tangziwen
1e016dc6d8
Always get the minimum distance intersect point.
2015-06-23 14:41:20 +08:00
tangziwen
f71ca4f179
Using ray-triangle intersect test instead of the newton method
2015-06-23 14:27:19 +08:00
XiaoYang
96bb244d69
Merge pull request #351 from tangziwen/v3
...
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 14:47:49 +08:00
tangziwen
1989de7a04
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 12:20:44 +08:00
Vincent Yang
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
pandamicro
bb275351f0
Merge pull request #12363 from super626/v3
...
Fix terrain lod computing bugs
2015-06-17 17:49:39 +08:00
yangxiao
12a352a1db
add comment
2015-06-17 16:32:08 +08:00
XiaoYang
5dd2aa2884
Merge pull request #349 from tangziwen/v3
...
fix camera position
2015-06-17 16:01:02 +08:00
tangziwen
e9c95229e0
fix camera position
2015-06-17 15:58:17 +08:00
songchengjiang
c08a355a06
fix the bug of light
...
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
tangziwen
60115b1ce1
update
2015-06-16 17:46:21 +08:00
tangziwen
0eaf9b5acc
Fix camera's incorrect position in chunks' LOD calculating.
2015-06-16 17:29:43 +08:00
WuHao
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
pandamicro
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
Ricardo Quesada
2a3347dd49
RenderState: default state fixes
...
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
yangxiao
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
Jacky
b41c60dbdb
Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
...
# Conflicts:
# external/config.json
2015-06-10 10:23:43 +08:00
pandamicro
1b75d4a192
Merge pull request #12212 from super626/sprite3d
...
call setTransparent
2015-06-08 14:21:40 +08:00
WuHao
0808b6aff9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
子龙山人
c5ba7eef8b
Merge pull request #12019 from super626/v3
...
getIntersectionPoint failed when there is no intersection on the terrain
2015-06-08 11:26:19 +08:00
Ricardo Quesada
453a3d93bc
samplers are treated as uniforms
2015-06-05 14:55:33 -07:00
yangxiao
8e558db3d6
call setTransparent
2015-06-05 16:25:09 +08:00
WuHao
5b572ab803
Polyinfo is no longer a pointer
2015-06-04 16:20:00 +08:00
yangxiao
8b5333a5c9
Merge branch 'newcode' into navigation2
2015-06-04 12:44:39 +08:00
Ricardo Quesada
5f6f38616a
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
2015-06-02 17:05:05 -07:00
Ricardo Quesada
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
WuHao
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +08:00
yangxiao
618f63cb35
replace windows folder sperator
2015-05-29 16:43:36 +08:00
yangxiao
410d09525f
setTransparent for mesh command
2015-05-29 16:38:42 +08:00
yangxiao
db2b2cf0b8
getTrianglesList for obj file
2015-05-29 16:37:37 +08:00