{"action":"created","comment":{"url":"https://api.github.com/repos/cocos-creator/engine/pulls/comments/93190601","pull_request_review_id":13711749,"id":93190601,"diff_hunk":"@@ -97,126 +96,125 @@ cc.PresetShaders = {\n             + \"varying lowp vec4 v_fragmentColor;\\n\"\n             + \"void main()\\n\"\n             + \"{\\n\"\n-            + \"    gl_Position = CC_PMatrix * a_position;  \\n\"\n-            + \"    v_fragmentColor = a_color;             \\n\"\n+            + \" gl_Position = CC_PMatrix * a_position;\\n\"\n+            + \" v_fragmentColor = a_color;\\n\"\n             + \"}\",\n \n     // --------------------- Shader_PositionColorLengthTexture Shader source------------------------\n     /**\n      * @property POSITION_COLOR_LENGTH_TEXTURE_FRAG\n      * @type {String}\n      */\n-    POSITION_COLOR_LENGTH_TEXTURE_FRAG : \"// #extension GL_OES_standard_derivatives : enable\\n\"\n-            + \"varying mediump vec4 v_color;\\n\"\n+    POSITION_COLOR_LENGTH_TEXTURE_FRAG : // + #extension GL_OES_standard_derivatives : enable\\n\"\n+              \"varying mediump vec4 v_color;\\n\"\n             + \"varying mediump vec2 v_texcoord;\\n\"\n-            + \"void main()\t\\n\"\n-            + \"{ \\n\"\n-            + \"// #if defined GL_OES_standard_derivatives\t\\n\"\n-            + \"// gl_FragColor = v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0 - length(v_texcoord)); \\n\"\n-            + \"// #else\t\\n\"\n-            + \"gl_FragColor = v_color * step(0.0, 1.0 - length(v_texcoord)); \\n\"\n-            + \"// #endif \\n\"\n+            + \"void main()\\n\"\n+            + \"{\\n\"\n+         // + #if defined GL_OES_standard_derivatives\\n\"\n+         // + gl_FragColor=v_color*smoothstep(0.0, length(fwidth(v_texcoord)), 1.0-length(v_texcoord));\\n\"\n+         // + #else\\n\"\n+            + \" gl_FragColor = v_color * step(0.0, 1.0 - length(v_texcoord));\\n\"\n+         // + #endif\\n\"\n             + \"}\",\n \n     /**\n      * @property POSITION_COLOR_LENGTH_TEXTURE_VERT\n      * @type {String}\n      */\n-    POSITION_COLOR_LENGTH_TEXTURE_VERT : \"attribute mediump vec4 a_position; \\n\"\n-            + \"attribute mediump vec2 a_texcoord; \\n\"\n-            + \"attribute mediump vec4 a_color;\t\\n\"\n-            + \"varying mediump vec4 v_color; \\n\"\n-            + \"varying mediump vec2 v_texcoord;\t\\n\"\n-            + \"void main() \\n\"\n-            + \"{ \\n\"\n-            + \"     v_color = a_color;//vec4(a_color.rgb * a_color.a, a_color.a); \\n\"\n-            + \"     v_texcoord = a_texcoord; \\n\"\n-            //+ \"    gl_Position = CC_MVPMatrix * a_position;  \\n\"\n-            + \"    gl_Position = (CC_PMatrix * CC_MVMatrix) * a_position;  \\n\"\n+    POSITION_COLOR_LENGTH_TEXTURE_VERT : \"attribute mediump vec4 a_position;\\n\"\n+            + \"attribute mediump vec2 a_texcoord;\\n\"\n+            + \"attribute mediump vec4 a_color;\\n\"\n+            + \"varying mediump vec4 v_color;\\n\"\n+            + \"varying mediump vec2 v_texcoord;\\n\"\n+            + \"void main()\\n\"\n+            + \"{\\n\"\n+            + \" v_color = a_color;\\n\" //vec4(a_color.rgb*a_color.a, a_color.a);","path":"cocos2d/shaders/CCShaders.js","position":127,"original_position":127,"commit_id":"bd8127aff7d4792e9f8e2f4d2acfa723fbd9cd0a","original_commit_id":"bd8127aff7d4792e9f8e2f4d2acfa723fbd9cd0a","user":{"login":"jareguo","id":1503156,"avatar_url":"https://avatars.githubusercontent.com/u/1503156?v=3","gravatar_id":"","url":"https://api.github.com/users/jareguo","html_url":"https://github.com/jareguo","followers_url":"https://api.github.com/users/jareguo/followers","following_url":"https://api.github.com/users/jareguo/following{/other_user}","gists_url":"https://api.github.com/users/jareguo/gists{/gist_id}","starred_url":"https://api.github.com/users/jareguo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jareguo/subscriptions","organizations_url":"https://api.github.com/users/jareguo/orgs","repos_url":"https://api.github.com/users/jareguo/repos","events_url":"https://api.github.com/users/jareguo/events{/privacy}","received_events_url":"https://api.github.com/users/jareguo/received_events","type":"User","site_admin":false},"body":"应该只有这类的注释是能去掉的吧？","created_at":"2016-12-20T08:37:06Z","updated_at":"2016-12-20T08:40:05Z","html_url":"https://github.com/cocos-creator/engine/pull/1380#discussion_r93190601","pull_request_url":"https://api.github.com/repos/cocos-creator/engine/pulls/1380","_links":{"self":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/comments/93190601"},"html":{"href":"https://github.com/cocos-creator/engine/pull/1380#discussion_r93190601"},"pull_request":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/1380"}}},"pull_request":{"url":"https://api.github.com/repos/cocos-creator/engine/pulls/1380","id":98705097,"html_url":"https://github.com/cocos-creator/engine/pull/1380","diff_url":"https://github.com/cocos-creator/engine/pull/1380.diff","patch_url":"https://github.com/cocos-creator/engine/pull/1380.patch","issue_url":"https://api.github.com/repos/cocos-creator/engine/issues/1380","number":1380,"state":"open","locked":false,"title":"optimization shader and tooltip for #fireball/issues/4771","user":{"login":"knoxHuang","id":7564028,"avatar_url":"https://avatars.githubusercontent.com/u/7564028?v=3","gravatar_id":"","url":"https://api.github.com/users/knoxHuang","html_url":"https://github.com/knoxHuang","followers_url":"https://api.github.com/users/knoxHuang/followers","following_url":"https://api.github.com/users/knoxHuang/following{/other_user}","gists_url":"https://api.github.com/users/knoxHuang/gists{/gist_id}","starred_url":"https://api.github.com/users/knoxHuang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/knoxHuang/subscriptions","organizations_url":"https://api.github.com/users/knoxHuang/orgs","repos_url":"https://api.github.com/users/knoxHuang/repos","events_url":"https://api.github.com/users/knoxHuang/events{/privacy}","received_events_url":"https://api.github.com/users/knoxHuang/received_events","type":"User","site_admin":false},"body":"Re: cocos-creator/fireball#4771\r\n\r\nChanges proposed in this pull request:\r\n *  优化 shader 和 toolstip\r\n\r\n@cocos-creator/engine-admins\r\n","created_at":"2016-12-20T08:27:30Z","updated_at":"2016-12-20T08:40:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c3d35f7225bb78fa5a51157cee251e9ff69394a0","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/cocos-creator/engine/pulls/1380/commits","review_comments_url":"https://api.github.com/repos/cocos-creator/engine/pulls/1380/comments","review_comment_url":"https://api.github.com/repos/cocos-creator/engine/pulls/comments{/number}","comments_url":"https://api.github.com/repos/cocos-creator/engine/issues/1380/comments","statuses_url":"https://api.github.com/repos/cocos-creator/engine/statuses/bd8127aff7d4792e9f8e2f4d2acfa723fbd9cd0a","head":{"label":"knoxHuang:v1.4","ref":"v1.4","sha":"bd8127aff7d4792e9f8e2f4d2acfa723fbd9cd0a","user":{"login":"knoxHuang","id":7564028,"avatar_url":"https://avatars.githubusercontent.com/u/7564028?v=3","gravatar_id":"","url":"https://api.github.com/users/knoxHuang","html_url":"https://github.com/knoxHuang","followers_url":"https://api.github.com/users/knoxHuang/followers","following_url":"https://api.github.com/users/knoxHuang/following{/other_user}","gists_url":"https://api.github.com/users/knoxHuang/gists{/gist_id}","starred_url":"https://api.github.com/users/knoxHuang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/knoxHuang/subscriptions","organizations_url":"https://api.github.com/users/knoxHuang/orgs","repos_url":"https://api.github.com/users/knoxHuang/repos","events_url":"https://api.github.com/users/knoxHuang/events{/privacy}","received_events_url":"https://api.github.com/users/knoxHuang/received_events","type":"User","site_admin":false},"repo":{"id":54607474,"name":"engine-2","full_name":"knoxHuang/engine-2","owner":{"login":"knoxHuang","id":7564028,"avatar_url":"https://avatars.githubusercontent.com/u/7564028?v=3","gravatar_id":"","url":"https://api.github.com/users/knoxHuang","html_url":"https://github.com/knoxHuang","followers_url":"https://api.github.com/users/knoxHuang/followers","following_url":"https://api.github.com/users/knoxHuang/following{/other_user}","gists_url":"https://api.github.com/users/knoxHuang/gists{/gist_id}","starred_url":"https://api.github.com/users/knoxHuang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/knoxHuang/subscriptions","organizations_url":"https://api.github.com/users/knoxHuang/orgs","repos_url":"https://api.github.com/users/knoxHuang/repos","events_url":"https://api.github.com/users/knoxHuang/events{/privacy}","received_events_url":"https://api.github.com/users/knoxHuang/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/knoxHuang/engine-2","description":"New integrated engine to replace cocos2d-html5","fork":true,"url":"https://api.github.com/repos/knoxHuang/engine-2","forks_url":"https://api.github.com/repos/knoxHuang/engine-2/forks","keys_url":"https://api.github.com/repos/knoxHuang/engine-2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/knoxHuang/engine-2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/knoxHuang/engine-2/teams","hooks_url":"https://api.github.com/repos/knoxHuang/engine-2/hooks","issue_events_url":"https://api.github.com/repos/knoxHuang/engine-2/issues/events{/number}","events_url":"https://api.github.com/repos/knoxHuang/engine-2/events","assignees_url":"https://api.github.com/repos/knoxHuang/engine-2/assignees{/user}","branches_url":"https://api.github.com/repos/knoxHuang/engine-2/branches{/branch}","tags_url":"https://api.github.com/repos/knoxHuang/engine-2/tags","blobs_url":"https://api.github.com/repos/knoxHuang/engine-2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/knoxHuang/engine-2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/knoxHuang/engine-2/git/refs{/sha}","trees_url":"https://api.github.com/repos/knoxHuang/engine-2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/knoxHuang/engine-2/statuses/{sha}","languages_url":"https://api.github.com/repos/knoxHuang/engine-2/languages","stargazers_url":"https://api.github.com/repos/knoxHuang/engine-2/stargazers","contributors_url":"https://api.github.com/repos/knoxHuang/engine-2/contributors","subscribers_url":"https://api.github.com/repos/knoxHuang/engine-2/subscribers","subscription_url":"https://api.github.com/repos/knoxHuang/engine-2/subscription","commits_url":"https://api.github.com/repos/knoxHuang/engine-2/commits{/sha}","git_commits_url":"https://api.github.com/repos/knoxHuang/engine-2/git/commits{/sha}","comments_url":"https://api.github.com/repos/knoxHuang/engine-2/comments{/number}","issue_comment_url":"https://api.github.com/repos/knoxHuang/engine-2/issues/comments{/number}","contents_url":"https://api.github.com/repos/knoxHuang/engine-2/contents/{+path}","compare_url":"https://api.github.com/repos/knoxHuang/engine-2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/knoxHuang/engine-2/merges","archive_url":"https://api.github.com/repos/knoxHuang/engine-2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/knoxHuang/engine-2/downloads","issues_url":"https://api.github.com/repos/knoxHuang/engine-2/issues{/number}","pulls_url":"https://api.github.com/repos/knoxHuang/engine-2/pulls{/number}","milestones_url":"https://api.github.com/repos/knoxHuang/engine-2/milestones{/number}","notifications_url":"https://api.github.com/repos/knoxHuang/engine-2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/knoxHuang/engine-2/labels{/name}","releases_url":"https://api.github.com/repos/knoxHuang/engine-2/releases{/id}","deployments_url":"https://api.github.com/repos/knoxHuang/engine-2/deployments","created_at":"2016-03-24T02:09:50Z","updated_at":"2016-03-24T02:09:54Z","pushed_at":"2016-12-20T07:18:19Z","git_url":"git://github.com/knoxHuang/engine-2.git","ssh_url":"git@github.com:knoxHuang/engine-2.git","clone_url":"https://github.com/knoxHuang/engine-2.git","svn_url":"https://github.com/knoxHuang/engine-2","homepage":null,"size":25904,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"cocos-creator:master","ref":"master","sha":"2c309d26682b0fe86dd2b79f086a6c867d1f952a","user":{"login":"cocos-creator","id":6937061,"avatar_url":"https://avatars.githubusercontent.com/u/6937061?v=3","gravatar_id":"","url":"https://api.github.com/users/cocos-creator","html_url":"https://github.com/cocos-creator","followers_url":"https://api.github.com/users/cocos-creator/followers","following_url":"https://api.github.com/users/cocos-creator/following{/other_user}","gists_url":"https://api.github.com/users/cocos-creator/gists{/gist_id}","starred_url":"https://api.github.com/users/cocos-creator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cocos-creator/subscriptions","organizations_url":"https://api.github.com/users/cocos-creator/orgs","repos_url":"https://api.github.com/users/cocos-creator/repos","events_url":"https://api.github.com/users/cocos-creator/events{/privacy}","received_events_url":"https://api.github.com/users/cocos-creator/received_events","type":"Organization","site_admin":false},"repo":{"id":47440536,"name":"engine","full_name":"cocos-creator/engine","owner":{"login":"cocos-creator","id":6937061,"avatar_url":"https://avatars.githubusercontent.com/u/6937061?v=3","gravatar_id":"","url":"https://api.github.com/users/cocos-creator","html_url":"https://github.com/cocos-creator","followers_url":"https://api.github.com/users/cocos-creator/followers","following_url":"https://api.github.com/users/cocos-creator/following{/other_user}","gists_url":"https://api.github.com/users/cocos-creator/gists{/gist_id}","starred_url":"https://api.github.com/users/cocos-creator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cocos-creator/subscriptions","organizations_url":"https://api.github.com/users/cocos-creator/orgs","repos_url":"https://api.github.com/users/cocos-creator/repos","events_url":"https://api.github.com/users/cocos-creator/events{/privacy}","received_events_url":"https://api.github.com/users/cocos-creator/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cocos-creator/engine","description":"The engine for Cocos Creator","fork":false,"url":"https://api.github.com/repos/cocos-creator/engine","forks_url":"https://api.github.com/repos/cocos-creator/engine/forks","keys_url":"https://api.github.com/repos/cocos-creator/engine/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cocos-creator/engine/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cocos-creator/engine/teams","hooks_url":"https://api.github.com/repos/cocos-creator/engine/hooks","issue_events_url":"https://api.github.com/repos/cocos-creator/engine/issues/events{/number}","events_url":"https://api.github.com/repos/cocos-creator/engine/events","assignees_url":"https://api.github.com/repos/cocos-creator/engine/assignees{/user}","branches_url":"https://api.github.com/repos/cocos-creator/engine/branches{/branch}","tags_url":"https://api.github.com/repos/cocos-creator/engine/tags","blobs_url":"https://api.github.com/repos/cocos-creator/engine/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cocos-creator/engine/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cocos-creator/engine/git/refs{/sha}","trees_url":"https://api.github.com/repos/cocos-creator/engine/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cocos-creator/engine/statuses/{sha}","languages_url":"https://api.github.com/repos/cocos-creator/engine/languages","stargazers_url":"https://api.github.com/repos/cocos-creator/engine/stargazers","contributors_url":"https://api.github.com/repos/cocos-creator/engine/contributors","subscribers_url":"https://api.github.com/repos/cocos-creator/engine/subscribers","subscription_url":"https://api.github.com/repos/cocos-creator/engine/subscription","commits_url":"https://api.github.com/repos/cocos-creator/engine/commits{/sha}","git_commits_url":"https://api.github.com/repos/cocos-creator/engine/git/commits{/sha}","comments_url":"https://api.github.com/repos/cocos-creator/engine/comments{/number}","issue_comment_url":"https://api.github.com/repos/cocos-creator/engine/issues/comments{/number}","contents_url":"https://api.github.com/repos/cocos-creator/engine/contents/{+path}","compare_url":"https://api.github.com/repos/cocos-creator/engine/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cocos-creator/engine/merges","archive_url":"https://api.github.com/repos/cocos-creator/engine/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cocos-creator/engine/downloads","issues_url":"https://api.github.com/repos/cocos-creator/engine/issues{/number}","pulls_url":"https://api.github.com/repos/cocos-creator/engine/pulls{/number}","milestones_url":"https://api.github.com/repos/cocos-creator/engine/milestones{/number}","notifications_url":"https://api.github.com/repos/cocos-creator/engine/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cocos-creator/engine/labels{/name}","releases_url":"https://api.github.com/repos/cocos-creator/engine/releases{/id}","deployments_url":"https://api.github.com/repos/cocos-creator/engine/deployments","created_at":"2015-12-05T03:28:59Z","updated_at":"2016-12-19T08:43:21Z","pushed_at":"2016-12-20T08:27:30Z","git_url":"git://github.com/cocos-creator/engine.git","ssh_url":"git@github.com:cocos-creator/engine.git","clone_url":"https://github.com/cocos-creator/engine.git","svn_url":"https://github.com/cocos-creator/engine","homepage":"http://www.cocos2d-x.org/creator","size":25895,"stargazers_count":158,"watchers_count":158,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":102,"mirror_url":null,"open_issues_count":25,"forks":102,"open_issues":25,"watchers":158,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/1380"},"html":{"href":"https://github.com/cocos-creator/engine/pull/1380"},"issue":{"href":"https://api.github.com/repos/cocos-creator/engine/issues/1380"},"comments":{"href":"https://api.github.com/repos/cocos-creator/engine/issues/1380/comments"},"review_comments":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/1380/comments"},"review_comment":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/cocos-creator/engine/pulls/1380/commits"},"statuses":{"href":"https://api.github.com/repos/cocos-creator/engine/statuses/bd8127aff7d4792e9f8e2f4d2acfa723fbd9cd0a"}}}}
{"actor":{"display_login":"jareguo"}}