Commit Graph

26 Commits

Author SHA1 Message Date
Arnold 1d0107c087
alias backend::SamplerDescriptor 2019-03-13 10:54:26 +08:00
leeda 18a6d8241d update Copyright. might need manual fix later (#18659)
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
leeda ca46b062fd spine res name update, because files name changed before (#18586) 2017-12-26 09:10:24 +08:00
minggo 3ff521505e use correct resource (#17543) 2017-03-17 15:02:47 +08:00
mogemimi d160d79d5b Fix typos in comments and strings (#17333) 2017-02-10 10:35:52 +08:00
Paul Gardiner 6b27f014fc Correct the Skybox fov (#16655)
* Remove undrawn quads from the skybox mesh

CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.

Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.

This commit simply removes the never-rendered faces, and adds comments
explaining the technique.

* Within test code, remove setScale calls applied to skyboxes.

A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.

* Make the Skybox correctly account for the camera's fov

The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.

This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +08:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629)
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
2016-10-11 10:56:14 -07:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242)
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Vincent Yang c85dc71846 Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong. 2015-09-16 11:07:37 +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
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
Vincent Yang 46d25a45a0 Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest 2015-07-02 10:27:25 +08:00
Vincent Yang 1105111fab Merge v3 branch. 2015-06-30 11:59:56 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +08:00
Vincent Yang 27bf636eab Fix bug: spine animition can't show in Scene3DTest. 2015-06-18 11:45:17 +08:00
Vincent Yang 0e0c8cf72e Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away. 2015-06-18 09:54:48 +08:00
Huabing.Xu 8bdb8125a2 fix android compile error 2015-05-14 14:36:45 +08:00
Vincent Yang 761da2fd20 Scene3DTest ok. 2015-05-11 14:41:50 +08:00
Vincent Yang 3bf16dcc4d Add skybox and partile 3d in Scene3DTest. 2015-05-08 18:28:12 +08:00
Vincent Yang 966f3b6a3f Add terrain in Scene3DTest. 2015-05-08 11:46:27 +08:00
Vincent Yang 60aa223065 Add dialog in Scene3DTest. 2015-05-07 18:43:07 +08:00
Vincent Yang 1daca7fac9 Merge bug fix code. 2015-05-07 16:52:37 +08:00
Vincent Yang a8f0ad9d68 Add Scene3DTest. 2015-05-07 16:22:30 +08:00