robossembler/webstudio
7
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

scenes

Browse source
This commit is contained in:
IDONTSUDO 2024-07-25 11:50:43 +03:00
parent 9120729d41
commit 6003cfde04
9 changed files with 29 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vscode/settings.json vendored
View file

@ -6,7 +6,7 @@
"Количество",
"может",
"навык",
"Навыки",
"модели",
"Новое",
"отрицательное",
"принимать",

174
scene_builder.json
View file

@ -1,174 +0,0 @@
{
"scene": [
{
"type": "ROBOT",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"name": "ARM0",
"nDOF": 6,
"toolType": "RBS_GRIPPER",
"jointPosition": [
1.1,
2.2,
2.1,
3.1,
4.4
]
},
{
"type": "CAMERA",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"parent": "WORLD",
"fixed": "null/true",
"topic": "123",
"name": "CAMERA1",
"cameraType": "RGB",
"width": 100,
"updateRate": 100,
"fov": 10.0,
"near": 10,
"far": 10,
"height": 10
},
{
"type": "SOLID",
"name":"21341qd",
"solidType": "ENV",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"inertia": 1,
"mass": 1,
"mesh": "",
"collisionMesh": ""
},
{
"type": "SOLID",
"solidType": "ACTIVE",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"inertia": 1,
"mass": 1,
"mesh": "",
"collisionMesh": "",
"spawn": {
"type": "POINT",
"name": "123"
}
},
{
"type": "POINT",
"name": "123",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
}
},
{
"type": "SOLID",
"solidType": "ACTIVE",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"inertia": 1,
"mass": 1,
"visualMesh": "",
"collisionMesh": "",
"spawn": {
"type": "DEFAULT"
}
},
{
"type": "SOLID",
"solidType": "ACTIVE",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"inertia": 1,
"mass": 1,
"visualMesh": 100,
"collisionMesh": 100,
"spawn": {
"type": "ZONE",
"name": "111"
}
},
{
"type": "ZONE",
"name": "111",
"vector3": {
"x": 1.0,
"y": 1,
"z": 1
},
"quaternion": {
"x": 1,
"y": 2,
"z": 3,
"w": 4
},
"width": 100,
"height": 100,
"length": 100
}
]
}

2
server/src/core/controllers/http_controller.ts
View file

@ -182,7 +182,7 @@ export class CoreHttpController<V> implements ICoreHttpController {
public put(usecase: any) {
this.routes["PUT"] = usecase;
}
public delete(usecase: CallbackStrategyWithValidationModel<V>) {
public delete(usecase: any) {
this.routes["DELETE"] = usecase;
}
public async requestResponseController<T>(

21
server/src/features/scene/delete_scene_scenario.ts
View file

@ -1,16 +1,31 @@
import { CallbackStrategyWithIdQuery, ResponseBase } from "../../core/controllers/http_controller";
import { Result } from "../../core/helpers/result";
import { StaticFiles } from "../../core/models/static_files";
import { DeleteDataBaseModelUseCase } from "../../core/usecases/delete_database_model_usecase";
import { DeleteFileUseCase } from "../../core/usecases/delete_file_usecase";
import { ReadByIdDataBaseModelUseCase } from "../../core/usecases/read_by_id_database_model_usecase";
import { SearchManyDataBaseModelUseCase } from "../../core/usecases/search_many_database_model_usecase";
import { CoreValidation } from "../../core/validations/core_validation";
import { MongoIdValidation } from "../../core/validations/mongo_id_validation";
import { IProjectModel, ProjectDBModel } from "../projects/models/project_model_database_model";
import { SceneModel } from "./create_new_scene_scenario";
export class DeleteSceneScenario extends CallbackStrategyWithIdQuery {
idValidationExpression: CoreValidation = new MongoIdValidation();
call = async (id: string): ResponseBase =>
(await new ReadByIdDataBaseModelUseCase<SceneModel>(SceneModel).call(id)).map((sceneModel) => Result.ok()
// (await new DeleteDataBaseModelUseCase(SceneModel).call(id)).map(() => DeleteF )
(await new ReadByIdDataBaseModelUseCase<SceneModel>(SceneModel).call(id)).map(async (sceneModel) =>
(await new DeleteDataBaseModelUseCase(SceneModel).call(id)).map(async () =>
(
await new SearchManyDataBaseModelUseCase<IProjectModel>(ProjectDBModel).call(
{ isActive: true },
"is dont active projects"
)
).map(async (projectModel) => {
const { rootDir } = projectModel[0];
(await new DeleteFileUseCase()).call(`${rootDir}${StaticFiles.scenes}${sceneModel.name}.json`);
return Result.ok("Delete scene");
})
)
);
}

1
server/src/features/scene/scene_presentation.ts
View file

@ -16,6 +16,7 @@ export class ScenePresentation extends CrudController<SceneValidationModel, type
validationModel: SceneValidationModel,
databaseModel: SceneDBModel,
});
super.post(new CreateNewSceneScenario().call);
super.put(new EditSceneScenario().call);
this.subRoutes.push({

2
ui/src/core/ui/pages/main_page.tsx
View file

@ -64,7 +64,7 @@ export const MainPage = (props: IMainPageProps) => {
{ name: "Сборки", path: AssemblesScreenPath, icon: "Assembly" },
{ name: "Датасеты", path: DatasetsScreenPath, icon: "Datasets" },
{ name: "Сцена", path: SceneManagerPath, icon: "Scene" },
{ name: "Навыки", path: SkillScreenPath, icon: "Layers" },
{ name: "модели", path: SkillScreenPath, icon: "Layers" },
{ name: "Поведение", path: BehaviorTreeBuilderPath, icon: "Rocket" },
{ name: "Симуляция", path: SimulationScreenPath, icon: "Simulation" },
{ name: "Оценка", path: EstimateScreenPath, icon: "Grade" },

2
ui/src/features/behavior_tree_builder/presentation/behavior_tree_builder_screen.tsx
View file

@ -97,7 +97,7 @@ export const BehaviorTreeBuilderScreen = observer(() => {
>
<div>
<div style={{ height: 58, alignContent: "center" }}>
<CoreText text="Навыки" type={CoreTextType.medium} />
<CoreText text="модели" type={CoreTextType.medium} />
</div>
{store.skillTemplates ? <SkillTree skills={store.skillTree} dragEnd={store.dragEnd} /> : null}
</div>

7
ui/src/features/scene_manager/presentation/scene_manager_store.ts
View file

@ -193,14 +193,17 @@ export class SceneMangerStore extends UiDrawerFormState<SceneViewModel, HttpErro
hiddenMenu = () => (this.isSceneMenuShow = false);
init = async () => {};
init = async () => {
this.storeMode
.isEqualR(StoreMode.allScenes)
.map(() => this.mapOk("scenes", this.sceneHttpRepository.getAllScenes()));
};
initParam = (id: string | undefined) => {
if (id) {
this.activeSceneId = id;
this.storeMode = StoreMode.sceneInstance;
} else {
this.storeMode = StoreMode.allScenes;
this.mapOk("scenes", this.sceneHttpRepository.getAllScenes());
}
};
errorHandingStrategy = (error: HttpError) =>

2
ui/src/features/skils/skills_screen.tsx
View file

@ -27,7 +27,7 @@ export const SkillScreen = observer(() => {
return (
<>
<MainPage
page={"Навыки"}
page={"модели"}
panelChildren={
<div style={{ justifyContent: "center", display: "flex", padding: 10 }}>
{skills.map((el) => (