CVAT 3D - Milestone-4 (#2891)

* CVAT 3D Annotation - Added initial cuboid placement in all views

* Fixed MACOS issue for upload of zip files

* Fixed camera axis centre issue

* Fixed ESLint import issues

* Fixed context image fit issue and resizing possible on entire grey line between views

* Fixed the multiple interection point issue

* Fixed Naming convention as per SOW

* Trigger notification

* Reverted code to test cypress tests

* Fixed review comments

* Included tooltip and added actions for keys and UIOJKL buttons

* Merged dev code, updated changelog and minor fixes

* Fixed camera positioning issue in Top View

* Reverted kubernetes auto-corrected code

* Reverted kubernetes code

Co-authored-by: cdp <cdp123>

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [VGGFace2](https://github.com/ox-vgg/vgg_face2) format support (<https://github.com/openvinotoolkit/cvat/pull/2865>)
 - [Backup/Restore guide](cvat/apps/documentation/backup_guide.md) (<https://github.com/openvinotoolkit/cvat/pull/2964>)
 - Label deletion from tasks and projects (<https://github.com/openvinotoolkit/cvat/pull/2881>)
+- CVAT-3D: Implemented initial cuboid placement in 3D View and select cuboid in Top, Side and Front views
+  (<https://github.com/openvinotoolkit/cvat/pull/2891>)
 - [Market-1501](https://www.aitribune.com/dataset/2018051063) format support (<https://github.com/openvinotoolkit/cvat/pull/2869>)
 - Annotations filters UI using react-awesome-query-builder (https://github.com/openvinotoolkit/cvat/issues/1418)
 

cvat-canvas3d/package.json

@@ -38,7 +38,8 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
-    "three": "^0.125.0",
-    "camera-controls": "^1.25.3"
+    "@types/three": "^0.125.3",
+    "camera-controls": "^1.25.3",
+    "three": "^0.125.0"
   }
 }

cvat-canvas3d/src/typescript/canvas3d.ts

@@ -4,8 +4,12 @@
 
 import pjson from '../../package.json';
 import { Canvas3dController, Canvas3dControllerImpl } from './canvas3dController';
-import { Canvas3dModel, Canvas3dModelImpl, Mode } from './canvas3dModel';
-import { Canvas3dView, Canvas3dViewImpl, ViewsDOM } from './canvas3dView';
+import {
+    Canvas3dModel, Canvas3dModelImpl, Mode, DrawData, ViewType, MouseInteraction,
+} from './canvas3dModel';
+import {
+    Canvas3dView, Canvas3dViewImpl, ViewsDOM, CAMERA_ACTION,
+} from './canvas3dView';
 import { Master } from './master';
 
 const Canvas3dVersion = pjson.version;
@@ -17,6 +21,9 @@ interface Canvas3d {
     mode(): Mode;
     render(): void;
     keyControls(keys: KeyboardEvent): void;
+    mouseControls(type: string, event: MouseEvent): void;
+    draw(drawData: DrawData): void;
+    cancel(): void;
 }
 
 class Canvas3dImpl implements Canvas3d {
@@ -38,10 +45,18 @@ class Canvas3dImpl implements Canvas3d {
         this.view.keyControls(keys);
     }
 
+    public mouseControls(type: MouseInteraction, event: MouseEvent): void {
+        this.view.mouseControls(type, event);
+    }
+
     public render(): void {
         this.view.render();
     }
 
+    public draw(drawData: DrawData): void {
+        this.model.draw(drawData);
+    }
+
     public setup(frameData: any): void {
         this.model.setup(frameData);
     }
@@ -53,6 +68,12 @@ class Canvas3dImpl implements Canvas3d {
     public isAbleToChangeFrame(): boolean {
         return this.model.isAbleToChangeFrame();
     }
+
+    public cancel(): void {
+        this.model.cancel();
+    }
 }
 
-export { Canvas3dImpl as Canvas3d, Canvas3dVersion };
+export {
+    Canvas3dImpl as Canvas3d, Canvas3dVersion, ViewType, MouseInteraction, CAMERA_ACTION,
+};

cvat-canvas3d/src/typescript/canvas3dController.ts

@@ -2,9 +2,10 @@
 //
 // SPDX-License-Identifier: MIT
 
-import { Canvas3dModel, Mode } from './canvas3dModel';
+import { Canvas3dModel, Mode, DrawData } from './canvas3dModel';
 
 export interface Canvas3dController {
+    readonly drawData: DrawData;
     mode: Mode;
 }
 
@@ -22,4 +23,8 @@ export class Canvas3dControllerImpl implements Canvas3dController {
     public get mode(): Mode {
         return this.model.mode;
     }
+
+    public get drawData(): DrawData {
+        return this.model.data.drawData;
+    }
 }

cvat-canvas3d/src/typescript/canvas3dModel.ts

@@ -26,6 +26,19 @@ export enum FrameZoom {
     MAX = 10,
 }
 
+export enum ViewType {
+    PERSPECTIVE = 'perspective',
+    TOP = 'top',
+    SIDE = 'side',
+    FRONT = 'front',
+}
+
+export enum MouseInteraction {
+    CLICK = 'click',
+    DOUBLE_CLICK = 'dblclick',
+    HOVER = 'hover',
+}
+
 export enum UpdateReasons {
     IMAGE_CHANGED = 'image_changed',
     OBJECTS_UPDATED = 'objects_updated',
@@ -61,6 +74,8 @@ export interface Canvas3dModel {
     data: Canvas3dDataModel;
     setup(frameData: any): void;
     isAbleToChangeFrame(): boolean;
+    draw(drawData: DrawData): void;
+    cancel(): void;
 }
 
 export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
@@ -133,4 +148,18 @@ export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
 
         return !isUnable;
     }
+
+    public draw(drawData: DrawData): void {
+        if (drawData.enabled && this.data.drawData.enabled) {
+            throw new Error('Drawing has been already started');
+        }
+        this.data.drawData.enabled = drawData.enabled;
+        this.data.mode = Mode.DRAW;
+
+        this.notify(UpdateReasons.DRAW);
+    }
+
+    public cancel(): void {
+        this.notify(UpdateReasons.CANCEL);
+    }
 }