mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
committed by
Weiliang Wang
parent
cb101e6a0e
commit
162ea8cb26
@@ -373,13 +373,13 @@ export default [
|
||||
"shaders": [
|
||||
{
|
||||
"name": "pipeline/skybox|sky-vs:vert|sky-fs:frag",
|
||||
"hash": 3562844860,
|
||||
"hash": 1957154815,
|
||||
"glsl3": {
|
||||
"vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nin vec3 a_position;\nvoid CCDecode (out vec4 position) {\n position = vec4(a_position, 1.0);\n}\nout vec4 viewDir;\nhighp vec4 vert () {\n CCDecode(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n mat4 proj = mat4(\n 2.5 * cc_screenSize.y * cc_screenSize.z, 0, 0, 0,\n 0, 2.5, 0, 0,\n 0, 0, 101.0 / 99.0, -1,\n 0, 0, 200.0 / 99.0, 0\n );\n highp vec4 pos = proj * matViewRotOnly * viewDir;\n pos.z = pos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`,
|
||||
"vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nin vec3 a_position;\nvoid CCDecode (out vec4 position) {\n position = vec4(a_position, 1.0);\n}\nout vec4 viewDir;\nhighp vec4 vert () {\n CCDecode(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n highp vec4 pos = matViewRotOnly * viewDir;\n highp vec2 f = cc_matProj[3][3] > 0.0 ? vec2(2.0, 1.0) : vec2(cc_matProj[1][1]);\n pos.xy *= vec2(cc_screenSize.y * cc_screenSize.z, 1.0) * f;\n pos.zw = vec2(-0.99999 * pos.z, -pos.z);\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`,
|
||||
"frag": `\nprecision mediump float;\nuniform samplerCube cc_environment;\nvec3 unpackNormal(vec4 nmap) {\n return nmap.xyz * 2.0 - 1.0;\n}\nvec3 unpackRGBE(vec4 rgbe) {\n return rgbe.rgb * pow(2.0, rgbe.a * 255.0 - 128.0);\n}\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nvec4 CCFragOutput(vec4 color) {\n #if CC_USE_HDR\n color.rgb = mix(color.rgb, SRGBToLinear(color.rgb) * cc_exposure.w, vec3(cc_exposure.z));\n #endif\n return color;\n}\nin vec4 viewDir;\nvec4 frag () {\n #if USE_RGBE_CUBEMAP\n vec3 c = unpackRGBE(texture(cc_environment, viewDir.xyz));\n c = LinearToSRGB(c / (1.0 + c));\n vec4 o = vec4(c, 1.0);\n #else\n vec4 o = texture(cc_environment, viewDir.xyz);\n #endif\n return CCFragOutput(o);\n}\nout vec4 cc_FragColor;\nvoid main() { cc_FragColor = frag(); }\n`
|
||||
},
|
||||
"glsl1": {
|
||||
"vert": `\nprecision mediump float;\nuniform vec4 cc_screenSize;\nuniform mat4 cc_matView;\nattribute vec3 a_position;\nvoid CCDecode (out vec4 position) {\n position = vec4(a_position, 1.0);\n}\nvarying vec4 viewDir;\nhighp vec4 vert () {\n CCDecode(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n mat4 proj = mat4(\n 2.5 * cc_screenSize.y * cc_screenSize.z, 0, 0, 0,\n 0, 2.5, 0, 0,\n 0, 0, 101.0 / 99.0, -1,\n 0, 0, 200.0 / 99.0, 0\n );\n highp vec4 pos = proj * matViewRotOnly * viewDir;\n pos.z = pos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`,
|
||||
"vert": `\nprecision mediump float;\nuniform vec4 cc_screenSize;\nuniform mat4 cc_matView;\nuniform mat4 cc_matProj;\nattribute vec3 a_position;\nvoid CCDecode (out vec4 position) {\n position = vec4(a_position, 1.0);\n}\nvarying vec4 viewDir;\nhighp vec4 vert () {\n CCDecode(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n highp vec4 pos = matViewRotOnly * viewDir;\n highp vec2 f = cc_matProj[3][3] > 0.0 ? vec2(2.0, 1.0) : vec2(cc_matProj[1][1]);\n pos.xy *= vec2(cc_screenSize.y * cc_screenSize.z, 1.0) * f;\n pos.zw = vec2(-0.99999 * pos.z, -pos.z);\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`,
|
||||
"frag": `\nprecision mediump float;\nuniform samplerCube cc_environment;\nvec3 unpackNormal(vec4 nmap) {\n return nmap.xyz * 2.0 - 1.0;\n}\nvec3 unpackRGBE(vec4 rgbe) {\n return rgbe.rgb * pow(2.0, rgbe.a * 255.0 - 128.0);\n}\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nuniform vec4 cc_exposure;\nvec4 CCFragOutput(vec4 color) {\n #if CC_USE_HDR\n color.rgb = mix(color.rgb, SRGBToLinear(color.rgb) * cc_exposure.w, vec3(cc_exposure.z));\n #endif\n return color;\n}\nvarying vec4 viewDir;\nvec4 frag () {\n #if USE_RGBE_CUBEMAP\n vec3 c = unpackRGBE(textureCube(cc_environment, viewDir.xyz));\n c = LinearToSRGB(c / (1.0 + c));\n vec4 o = vec4(c, 1.0);\n #else\n vec4 o = textureCube(cc_environment, viewDir.xyz);\n #endif\n return CCFragOutput(o);\n}\nvoid main() { gl_FragColor = frag(); }\n`
|
||||
},
|
||||
"builtins": {"globals":{"blocks":[{"name":"CCGlobal", "defines":[]}], "samplers":[{"name":"cc_environment", "defines":[]}]}, "locals":{"blocks":[], "samplers":[]}},
|
||||
|
||||
@@ -35,7 +35,7 @@ import { GFXClearFlag } from '../../gfx/define';
|
||||
import { GFXWindow } from '../../gfx/window';
|
||||
import { Color, Rect, toRadian, Vec3 } from '../../math';
|
||||
import { Camera } from '../../renderer';
|
||||
import { CameraVisFlags } from '../../renderer/scene/camera';
|
||||
import { CameraVisFlags, SKYBOX_FLAG } from '../../renderer/scene/camera';
|
||||
import { Scene } from '../../scene-graph';
|
||||
import { Enum } from '../../value-types';
|
||||
|
||||
@@ -63,6 +63,7 @@ const ProjectionType = Enum({
|
||||
});
|
||||
|
||||
const CameraClearFlag = Enum({
|
||||
SKYBOX: SKYBOX_FLAG | GFXClearFlag.DEPTH_STENCIL,
|
||||
SOLID_COLOR: GFXClearFlag.ALL,
|
||||
DEPTH_ONLY: GFXClearFlag.DEPTH_STENCIL,
|
||||
DONT_CLEAR: GFXClearFlag.NONE,
|
||||
@@ -77,6 +78,7 @@ const CameraClearFlag = Enum({
|
||||
@executeInEditMode
|
||||
export class CameraComponent extends Component {
|
||||
public static ProjectionType = ProjectionType;
|
||||
public static CameraClearFlag = CameraClearFlag;
|
||||
|
||||
@property
|
||||
protected _projection = ProjectionType.PERSPECTIVE;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
*/
|
||||
|
||||
import { ccclass } from '../../data/class-decorator';
|
||||
import { GFXClearFlag } from '../../gfx/define';
|
||||
import { toRadian } from '../../math';
|
||||
import { Camera } from '../../renderer';
|
||||
import { CameraComponent } from './camera-component';
|
||||
import { CameraVisFlags } from '../../renderer/scene/camera';
|
||||
import { GFXClearFlag } from '../../gfx/define';
|
||||
import { CameraComponent } from './camera-component';
|
||||
|
||||
@ccclass('cc.EditorCameraComponent')
|
||||
export class EditorCameraComponent extends CameraComponent {
|
||||
|
||||
@@ -227,7 +227,7 @@ export class Quat extends ValueType {
|
||||
|
||||
/**
|
||||
* @zh 绕世界空间下指定轴旋转四元数
|
||||
* @param axis 旋转轴
|
||||
* @param axis 旋转轴,默认已归一化
|
||||
* @param rad 旋转弧度
|
||||
*/
|
||||
public static rotateAround <Out extends IQuatLike, VecLike extends IVec3Like> (out: Out, rot: Out, axis: VecLike, rad: number) {
|
||||
|
||||
@@ -26,7 +26,7 @@ import { Mat4, Vec3, Vec4 } from '../math';
|
||||
import { Camera, Model } from '../renderer';
|
||||
import { IDefineMap } from '../renderer/core/pass';
|
||||
import { programLib } from '../renderer/core/program-lib';
|
||||
import { CameraVisFlags } from '../renderer/scene/camera';
|
||||
import { CameraVisFlags, SKYBOX_FLAG } from '../renderer/scene/camera';
|
||||
import { Root } from '../root';
|
||||
import { IRenderObject, UBOGlobal, UBOShadow, UNIFORM_ENVIRONMENT } from './define';
|
||||
import { IInternalBindingInst } from './define';
|
||||
@@ -1455,7 +1455,7 @@ export abstract class RenderPipeline {
|
||||
planarShadows.updateDirLight(mainLight);
|
||||
}
|
||||
|
||||
if (scene.skybox.enabled) {
|
||||
if (scene.skybox.enabled && (camera.clearFlag & SKYBOX_FLAG)) {
|
||||
this.addVisibleModel(scene.skybox, camera);
|
||||
}
|
||||
|
||||
|
||||
@@ -90,6 +90,8 @@ export enum CameraVisFlags {
|
||||
UI2D = (1 << 25),
|
||||
}
|
||||
|
||||
export const SKYBOX_FLAG = GFXClearFlag.STENCIL << 1;
|
||||
|
||||
export class Camera {
|
||||
|
||||
private _scene: RenderScene;
|
||||
|
||||
@@ -129,7 +129,7 @@ export class SkyboxInfo {
|
||||
}
|
||||
|
||||
/**
|
||||
* @zh 是否启用天空盒?
|
||||
* @zh 是否启用环境光照?
|
||||
*/
|
||||
@property({ type: CCBoolean })
|
||||
set useIBL (val) {
|
||||
|
||||
@@ -23,8 +23,9 @@
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { GraphicsComponent, UIRenderComponent } from '../../../components';
|
||||
import { UIRenderComponent } from '../../../../core/components/ui-base/ui-render-component';
|
||||
import { IAssemblerManager } from '../../../../core/renderer/ui/base';
|
||||
import { GraphicsComponent } from '../../../components';
|
||||
import { graphicsAssembler as graphics } from './graphics-assembler';
|
||||
|
||||
const graphicsAssemblerManager: IAssemblerManager = {
|
||||
|
||||
@@ -27,14 +27,13 @@
|
||||
* @hidden
|
||||
*/
|
||||
|
||||
import { SpriteComponent, UIRenderComponent } from '../../components';
|
||||
import { UIRenderComponent } from '../../../core/components/ui-base/ui-render-component';
|
||||
import { IAssemblerManager } from '../../../core/renderer/ui/base';
|
||||
import { SpriteComponent } from '../../components';
|
||||
import { barFilled } from './bar-filled';
|
||||
import { radialFilled } from './radial-filled';
|
||||
import { simple } from './simple';
|
||||
import { sliced } from './sliced';
|
||||
// import { tilled } from './tiled';
|
||||
// import meshRenderUtil from './mesh';
|
||||
|
||||
const SpriteType = SpriteComponent.Type;
|
||||
const FillType = SpriteComponent.FillType;
|
||||
|
||||
@@ -29,16 +29,16 @@
|
||||
*/
|
||||
|
||||
import { SpriteFrame } from '../../core/assets';
|
||||
import { ccclass, executionOrder, menu, property } from '../../core/data/class-decorator';
|
||||
import { SystemEventType } from '../../core/platform/event-manager/event-enum';
|
||||
import { clamp, Color, Mat4, Vec2, Vec3 } from '../../core/math';
|
||||
import { ccenum } from '../../core/value-types/enum';
|
||||
import { UI } from '../../core/renderer/ui/ui';
|
||||
import { GraphicsComponent } from './graphics-component';
|
||||
import { InstanceMaterialType, UIRenderComponent } from '../../core/components/ui-base/ui-render-component';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { ccclass, executionOrder, menu, property } from '../../core/data/class-decorator';
|
||||
import { clamp, Color, Mat4, Vec2, Vec3 } from '../../core/math';
|
||||
import { view } from '../../core/platform';
|
||||
import { SystemEventType } from '../../core/platform/event-manager/event-enum';
|
||||
import visibleRect from '../../core/platform/visible-rect';
|
||||
import { UI } from '../../core/renderer/ui/ui';
|
||||
import { Node } from '../../core/scene-graph';
|
||||
import { ccenum } from '../../core/value-types/enum';
|
||||
import { GraphicsComponent } from './graphics-component';
|
||||
|
||||
const _worldMatrix = new Mat4();
|
||||
const _vec2_temp = new Vec2();
|
||||
@@ -379,11 +379,11 @@ export class MaskComponent extends UIRenderComponent {
|
||||
// }
|
||||
}
|
||||
|
||||
protected _render(render: UI) {
|
||||
protected _render (render: UI) {
|
||||
render.commitComp(this, null, this._assembler!);
|
||||
}
|
||||
|
||||
protected _postRender(render: UI) {
|
||||
protected _postRender (render: UI) {
|
||||
if (!this._postAssembler) {
|
||||
return;
|
||||
}
|
||||
@@ -566,11 +566,11 @@ export class MaskComponent extends UIRenderComponent {
|
||||
|
||||
private _flushVisibility () {
|
||||
if (this._clearGraphics) {
|
||||
this._clearGraphics._setScreen(this._screen);
|
||||
this._clearGraphics._setScreen(this._screen!);
|
||||
}
|
||||
|
||||
if (this._graphics) {
|
||||
this._graphics._setScreen(this._screen);
|
||||
this._graphics._setScreen(this._screen!);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user