@openglobus/og 0.25.8 → 0.25.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/camera/Camera.d.ts +6 -0
- package/lib/control/CameraFrameComposer.d.ts +9 -25
- package/lib/control/CameraFrameHandler.d.ts +26 -0
- package/lib/control/FramebufferPreview.d.ts +25 -0
- package/lib/control/MouseNavigation.d.ts +1 -0
- package/lib/control/cameraDepthHandler/CameraDepthHandler.d.ts +25 -0
- package/lib/control/cameraDepthHandler/camera_depth.d.ts +2 -0
- package/lib/control/geoObjectEditor/GeoObjectEditorScene.d.ts +0 -1
- package/lib/control/index.d.ts +3 -0
- package/lib/og.es.js +1 -1
- package/lib/og.es.js.map +1 -1
- package/lib/renderer/RendererEvents.d.ts +2 -0
- package/lib/scene/Planet.d.ts +1 -4
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/ui/Dialog.d.ts +2 -0
- package/lib/webgl/BaseFramebuffer.d.ts +3 -0
- package/lib/webgl/Framebuffer.d.ts +10 -1
- package/lib/webgl/Program.d.ts +2 -0
- package/package.json +2 -1
package/lib/camera/Camera.d.ts
CHANGED
|
@@ -37,6 +37,8 @@ export interface ICameraParams {
|
|
|
37
37
|
* @fires EventsHandler<CameraEvents>#moveend
|
|
38
38
|
*/
|
|
39
39
|
declare class Camera {
|
|
40
|
+
static __counter__: number;
|
|
41
|
+
protected __id: number;
|
|
40
42
|
/**
|
|
41
43
|
* Camera events handler
|
|
42
44
|
* @public
|
|
@@ -122,6 +124,7 @@ declare class Camera {
|
|
|
122
124
|
_width: number;
|
|
123
125
|
_height: number;
|
|
124
126
|
constructor(options?: ICameraParams);
|
|
127
|
+
get id(): number;
|
|
125
128
|
checkMoveEnd(): void;
|
|
126
129
|
bindFrustumsPickingColors(renderer: Renderer): void;
|
|
127
130
|
/**
|
|
@@ -231,6 +234,9 @@ declare class Camera {
|
|
|
231
234
|
getPitch(): number;
|
|
232
235
|
getYaw(): number;
|
|
233
236
|
getRoll(): number;
|
|
237
|
+
getAbsolutePitch(): number;
|
|
238
|
+
getAbsoluteYaw(): number;
|
|
239
|
+
getAbsoluteRoll(): number;
|
|
234
240
|
/**
|
|
235
241
|
* Returns camera quaternion
|
|
236
242
|
*/
|
|
@@ -1,35 +1,19 @@
|
|
|
1
1
|
import { Control, IControlParams } from "./Control";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
type HandlerFunc = (camera?: Camera, framebuffer?: Framebuffer, gl?: WebGLContextExt | null) => void;
|
|
6
|
-
export interface ICameraFrameHadler {
|
|
7
|
-
camera: Camera;
|
|
8
|
-
frameBuffer: Framebuffer;
|
|
9
|
-
handler: HandlerFunc;
|
|
10
|
-
}
|
|
11
|
-
export declare class CameraFrameHandler {
|
|
12
|
-
camera: Camera;
|
|
13
|
-
frameBuffer: Framebuffer;
|
|
14
|
-
handler: HandlerFunc | null;
|
|
15
|
-
protected _composer: CameraFrameComposer | null;
|
|
16
|
-
protected _composerIndex: number;
|
|
17
|
-
constructor(params: ICameraFrameHadler);
|
|
18
|
-
addTo(composer: CameraFrameComposer): void;
|
|
19
|
-
remove(): void;
|
|
20
|
-
frame(): void;
|
|
21
|
-
}
|
|
2
|
+
import { CameraFrameHandler } from "./CameraFrameHandler";
|
|
3
|
+
import { EntityCollection } from "../entity";
|
|
4
|
+
import { RenderNode } from '../scene/RenderNode';
|
|
22
5
|
export interface ICameraFrameComposerParams extends IControlParams {
|
|
23
|
-
|
|
6
|
+
frameHandlers?: CameraFrameHandler[];
|
|
24
7
|
}
|
|
25
8
|
export declare class CameraFrameComposer extends Control {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
9
|
+
readonly _frameHandlers: CameraFrameHandler[];
|
|
10
|
+
protected _cameraLayer: EntityCollection;
|
|
11
|
+
protected _cameraScene: RenderNode;
|
|
12
|
+
constructor(params?: ICameraFrameComposerParams);
|
|
13
|
+
get frameHandlers(): CameraFrameHandler[];
|
|
29
14
|
add(handler: CameraFrameHandler): void;
|
|
30
15
|
oninit(): void;
|
|
31
16
|
activate(): void;
|
|
32
17
|
deactivate(): void;
|
|
33
18
|
protected _onPostdraw: () => void;
|
|
34
19
|
}
|
|
35
|
-
export {};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Camera } from "../camera/Camera";
|
|
2
|
+
import { Framebuffer } from "../webgl/Framebuffer";
|
|
3
|
+
import { Entity } from "../entity/Entity";
|
|
4
|
+
import { Vec3 } from "../math/Vec3";
|
|
5
|
+
import { CameraFrameComposer } from "./CameraFrameComposer";
|
|
6
|
+
export type FrameHandlerFunc = (frameHandler: CameraFrameHandler) => void;
|
|
7
|
+
export interface ICameraFrameHadler {
|
|
8
|
+
camera: Camera;
|
|
9
|
+
frameBuffer: Framebuffer;
|
|
10
|
+
frameHandler: FrameHandlerFunc;
|
|
11
|
+
showFrustum?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export declare class CameraFrameHandler {
|
|
14
|
+
readonly camera: Camera;
|
|
15
|
+
readonly frameBuffer: Framebuffer;
|
|
16
|
+
frameHandler: FrameHandlerFunc | null;
|
|
17
|
+
protected _composer: CameraFrameComposer | null;
|
|
18
|
+
protected _composerIndex: number;
|
|
19
|
+
readonly cameraEntity: Entity;
|
|
20
|
+
showFrustum: boolean;
|
|
21
|
+
constructor(params: ICameraFrameHadler);
|
|
22
|
+
get frustumScale(): Vec3;
|
|
23
|
+
addTo(composer: CameraFrameComposer): void;
|
|
24
|
+
remove(): void;
|
|
25
|
+
frame(): void;
|
|
26
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Dialog } from "../ui/Dialog";
|
|
2
|
+
import { Framebuffer } from "../webgl/Framebuffer";
|
|
3
|
+
import { Control, IControlParams } from "./Control";
|
|
4
|
+
import { Program } from "../webgl/Program";
|
|
5
|
+
export interface IFramebufferDialogParams extends IControlParams {
|
|
6
|
+
framebuffer?: Framebuffer;
|
|
7
|
+
title?: string;
|
|
8
|
+
common?: string;
|
|
9
|
+
image?: string;
|
|
10
|
+
flippedUV?: boolean;
|
|
11
|
+
}
|
|
12
|
+
export declare class FramebufferPreview extends Control {
|
|
13
|
+
protected _dialog: Dialog<null>;
|
|
14
|
+
$canvas: HTMLCanvasElement;
|
|
15
|
+
protected _framebuffer: Framebuffer | null;
|
|
16
|
+
protected _screenFramebuffer: Framebuffer | null;
|
|
17
|
+
framebufferCurrentTexture: number;
|
|
18
|
+
protected _program: Program;
|
|
19
|
+
constructor(params: IFramebufferDialogParams);
|
|
20
|
+
bindFramebuffer(framebuffer: Framebuffer): void;
|
|
21
|
+
oninit(): void;
|
|
22
|
+
activate(): void;
|
|
23
|
+
deactivate(): void;
|
|
24
|
+
protected _onDraw: () => void;
|
|
25
|
+
}
|
|
@@ -46,6 +46,7 @@ export declare class MouseNavigation extends Control {
|
|
|
46
46
|
protected _screenPosIsChanged: boolean;
|
|
47
47
|
protected _rotHDir: number;
|
|
48
48
|
protected _rotVDir: number;
|
|
49
|
+
protected _dragInertia: number;
|
|
49
50
|
constructor(options?: IEarthNavigationParams);
|
|
50
51
|
oninit(): void;
|
|
51
52
|
onactivate(): void;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { CameraFrameComposer } from "../CameraFrameComposer";
|
|
2
|
+
import { CameraFrameHandler } from "../CameraFrameHandler";
|
|
3
|
+
import { Camera } from "../../camera/Camera";
|
|
4
|
+
import { Framebuffer } from "../../webgl";
|
|
5
|
+
import { Control, IControlParams } from "../Control";
|
|
6
|
+
import { Vec3 } from "../../math/Vec3";
|
|
7
|
+
import { LonLat } from "../../LonLat";
|
|
8
|
+
import { GeoImage } from "../../layer/GeoImage";
|
|
9
|
+
export interface ICameraDepthhandlerParams extends IControlParams {
|
|
10
|
+
}
|
|
11
|
+
export declare class CameraDepthHandler extends Control {
|
|
12
|
+
protected _depthHandler: CameraFrameHandler | null;
|
|
13
|
+
protected _frameComposer: CameraFrameComposer;
|
|
14
|
+
readonly cameraGeoImage: GeoImage;
|
|
15
|
+
constructor(params: ICameraDepthhandlerParams);
|
|
16
|
+
protected _createCamera(): Camera;
|
|
17
|
+
get camera(): Camera | undefined;
|
|
18
|
+
oninit(): void;
|
|
19
|
+
get framebuffer(): Framebuffer | undefined;
|
|
20
|
+
protected _depthHandlerCallback: (frameHandler: CameraFrameHandler) => void;
|
|
21
|
+
getCartesianFromPixelTerrain(x: number, y: number): Vec3 | undefined;
|
|
22
|
+
getLonLatFromPixelTerrain(x: number, y: number): LonLat | undefined;
|
|
23
|
+
activate(): void;
|
|
24
|
+
deactivate(): void;
|
|
25
|
+
}
|
|
@@ -106,7 +106,6 @@ declare class GeoObjectEditorScene extends RenderNode {
|
|
|
106
106
|
protected _onLclick: (e: IMouseState) => void;
|
|
107
107
|
clear(): void;
|
|
108
108
|
frame(): void;
|
|
109
|
-
protected get _ellipsoid(): Ellipsoid | null;
|
|
110
109
|
protected _moveX: (e: IMouseState) => void;
|
|
111
110
|
protected _moveY: (e: IMouseState) => void;
|
|
112
111
|
protected _moveZ: (e: IMouseState) => void;
|
package/lib/control/index.d.ts
CHANGED
|
@@ -30,3 +30,6 @@ export * from "./geoObjectEditor/GeoObjectEditor";
|
|
|
30
30
|
export * from "./CameraLock";
|
|
31
31
|
export * from "./object3dManager/Object3dManager";
|
|
32
32
|
export * from "./CameraFrameComposer";
|
|
33
|
+
export * from "./CameraFrameHandler";
|
|
34
|
+
export * from "./cameraDepthHandler/CameraDepthHandler";
|
|
35
|
+
export * from "./FramebufferPreview";
|