imi-bas/pronature-platform
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

lists

Browse Source
This commit is contained in:
goynov
2025-03-17 09:14:01 +02:00
parent 733d212f17
commit d5d8d60212
7 changed files with 56 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/bl/ScenariosManager.js
+1 -1
View File
@@ -5,7 +5,7 @@ const collection = 'scenarios';
* Scenarios manager class, контролен клас за управление на игрови сценарии
*/
class ScenariosManager{
name = 'scenarios';
name = 'scenario';
/**
* Class initializer, инициализация
backend/controllers/api/ScenariosController.js
+5 -5
View File
@@ -14,7 +14,7 @@ class ScenariosController{
*/
init(app){
const router = express.Router();
const { scenarios } = app;
const { scenario } = app;
/**
* API: PUT /api/scenario/ Create or update scenario, създаване/обновяване на игрови сценарий
@@ -24,7 +24,7 @@ class ScenariosController{
router.put('/', async (req, res)=>{
try{
let data = req.body;
let object = await scenarios[data.id? 'update' : 'create'](req, data)
let object = await scenario[data.id? 'update' : 'create'](req, data)
res.json({status: 'OK', object});
}catch(err){
console.error(err);
@@ -39,7 +39,7 @@ class ScenariosController{
* @memberof ScenariosController
*/
router.post('/', async (req, res)=>{
let result = await scenarios.list(req.body);
let result = await scenario.list(req.body);
res.json(result);
})
@@ -51,7 +51,7 @@ class ScenariosController{
* @memberof ScenariosController
*/
router.get('/:id', async (req, res)=>{
let object = await scenarios.read(parseInt(req.params.id));
let object = await scenario.read(parseInt(req.params.id));
res.json(object);
})
@@ -62,7 +62,7 @@ class ScenariosController{
* @memberof ScenariosController
*/
router.delete('/:id', async (req, res)=>{
await gameObject.remove(req.params.id);
await scenario.remove(req.params.id);
res.json({status: 'OK'});
})
src/components/SceneDesigner/AssetSelector.vue
+3 -7
View File
@@ -6,7 +6,7 @@
<v-row>
<v-col v-for="(v, i) in items" :key="i" cols="12" xs="6" sm="4" md="3" xl="2"
class="position-relative">
<v-img :src="`/asset/thumb/${v.asset?.thumb}`" @click="select(v.id)"
<v-img :src="`/asset/thumb/${v.asset?.thumb}`" @click="select(v)"
class="cursor-pointer"></v-img>
<div class="d-flex">
<span class="flex-grow-1">{{ v.name }}</span>
@@ -39,10 +39,6 @@ export default {
}
},
mounted(){
console.log(this.activatorProps, this.cls)
},
async created(){
this.items = (await this.$api.gameObject.search({
type: { $in: this.$p.objectTypes.filter(t=>t.type == this.type || !this.type).map(t=>t.value) }
@@ -50,8 +46,8 @@ export default {
},
methods:{
select(id){
this.$emit('select', id);
select(v){
this.$emit('select', { id: v.id, name: v.name });
this.dialog = false;
}
}
src/components/SceneDesigner/GameObject.vue
+9 -3
View File
@@ -1,12 +1,12 @@
<template>
<teleport to=".scene-designer" v-if="active">
<teleport to=".scene-designer .game-objects" v-if="active">
<g @mousedown="$emit('target', {target:vd, attrs:['x1', 'y1'], delta: true})" :class="{gameObject: true, selected}" v-show="visible && parent.visible">
<line :x1="vd.x1" :y1="vd.y1" :x2="parent.vd.x1" :y2="parent.vd.y1"></line>
<svg-icon :src="`/asset/thumb/${modelValue.id||0}.webp`" :x="vd.x1" :y="vd.y1" :size="37"></svg-icon>
<svg-icon :src="`/asset/thumb/${modelValue.go||0}.webp`" :x="vd.x1" :y="vd.y1" :size="37"></svg-icon>
</g>
</teleport>
<v-card v-if="selected" class="py-4">
<asset-selector @select="modelValue.id = $event" type="GameObject">
<asset-selector @select="assignGameObject" type="GameObject">
<template v-slot:activator="props">
<v-btn v-bind="props" prepend-icon="mdi-panorama-outline" color="success" block>Choose game object</v-btn>
</template>
@@ -47,6 +47,12 @@ export default {
methods:{
intersect(v){
return Utils.intersectLineRect(this.vd, v);
},
assignGameObject(e){
this.modelValue.go = e.id;
if (this.modelValue.id == this.modelValue.title){
this.modelValue.title = e.name
}
}
}
}
src/components/SceneDesigner/Scene.vue
+8 -2
View File
@@ -1,11 +1,11 @@
<template>
<teleport to=".scene-designer" v-if="active">
<teleport to=".scene-designer .scenes" v-if="active">
<g @mousedown="$emit('target', {target:vd, attrs:['x1', 'y1'], delta: true})" :class="{scene: true, selected}" v-show="visible">
<svg-icon :src="`/asset/thumb/${modelValue.environment||0}.webp`" :x="vd.x1" :y="vd.y1" :size="65"></svg-icon>
</g>
</teleport>
<v-card title="Scene" v-if="selected">
<asset-selector @select="modelValue.environment = $event" type="Scene">
<asset-selector @select="assignGameObject" type="Scene">
<template v-slot:activator="props">
<v-btn v-bind="props" prepend-icon="mdi-panorama-outline" block color="success" class="py-4">Choose environment</v-btn>
</template>
@@ -49,6 +49,12 @@ export default {
methods:{
intersect(v){
return Utils.intersectLineRect(this.vd, v);
},
assignGameObject(e){
this.modelValue.environment = e.id;
if (this.modelValue.id == this.modelValue.title){
this.modelValue.title = e.name
}
}
}
}
src/components/SceneDesigner/SceneDesigner.vue
+26 -62
View File
@@ -21,13 +21,16 @@
:viewBox="`${vb.x} ${vb.y} ${vb.w} ${vb.h}`" x="0" y="0" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<SvgRectangle v-model="selector" class="selector"></SvgRectangle>
<g class="tasks"></g>
<g class="game-objects"></g>
<g class="scenes"></g>
</svg>
</div>
<v-navigation-drawer location="right" width="400">
<v-list density="compact" nav v-model:selected="selectedItem"
:select-strategy="mode == 'select' ? 'leaf' : 'single-leaf'">
<v-list-item v-for="(item, i) in flatItems.toSorted((a,b)=>a.__path.localeCompare(b.__path))"
:key="i" :title="item.data.title" :value="item" :style="`padding-left:${item.__level}rem`">
:key="i" :title="item.data.title" :value="item" :style="`padding-left:${item.__level}rem`" v-show="!item.__parent || item.__parent.vd.expanded">
<template v-slot:prepend>
<v-btn variant="plain" density="comfortable" size="small"
:icon="`mdi-eye${item.visible ? '' : '-off'}`"
@@ -35,60 +38,13 @@
<!-- <v-icon :icon="components[item.name].icon" size="small"></v-icon> -->
</template>
<template v-slot:append>
<v-btn variant="plain" density="compact" class="float-right" size="small" color="red-darken-4" icon="mdi-delete"
@click="items.splice(i, 1)"></v-btn>
<v-btn variant="plain" density="compact" size="small" color="red-darken-4" icon="mdi-delete"
@click="remove(item)"></v-btn>
<v-btn v-if="item.__type != 'Task'" :icon="item.vd.expanded ? 'mdi-chevron-up' : 'mdi-chevron-down'"
variant="plain" size="small" @click="item.vd.expanded = !item.vd.expanded"></v-btn>
</template>
</v-list-item>
</v-list>
<v-list density="compact" v-model:selected="selectedItem"
:select-strategy="mode == 'select' ? 'independent' : 'single-independent'" selectable
open-strategy="multiple">
<v-list-group v-for="(item, i) in items" :key="i" :value="item" subgroup>
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" color="secondary">
<template v-slot:prepend>
<v-btn variant="plain" density="comfortable" size="small"
:icon="`mdi-eye${item.visible ? '' : '-off'}`"
@click.stop="item.visible = !item.visible"></v-btn>
<!-- <v-icon :icon="components[item.name].icon" size="small"></v-icon> -->
</template>
<v-list-item-title>
{{ item.data.title }}
<v-btn variant="plain" density="compact" class="float-right" size="small" color="red-darken-4" icon="mdi-delete"
@click="items.splice(i, 1)"></v-btn>
</v-list-item-title>
</v-list-item>
</template>
<v-list-group v-for="(go, i) in item.data.gameObjects" :key="i" :value="go" subgroup>
<template v-slot:activator="{ props }">
<v-list-item color="primary" v-bind="props" >
<template v-slot:prepend>
<v-btn variant="plain" density="comfortable" size="small"
:icon="`mdi-eye${go.visible ? '' : '-off'}`"
@click.stop="go.visible = !go.visible"></v-btn>
</template>
<v-list-item-title>
{{ go.data.title }}
<v-btn variant="plain" density="compact" class="float-right" size="small" color="red-darken-4" icon="mdi-delete"
@click="item.data.gameObjects.splice(i, 1)"></v-btn>
</v-list-item-title>
</v-list-item>
</template>
<v-list-item v-for="(task, i) in go.data.tasks" :key="i" :value="task" color="primary">
<template v-slot:prepend>
<v-btn variant="plain" density="comfortable" size="small"
:icon="`mdi-eye${task.visible ? '' : '-off'}`"
@click.stop="task.visible = !task.visible"></v-btn>
</template>
<v-list-item-title>
{{ task.data.title }}
<v-btn variant="plain" density="compact" class="float-right" size="small" color="red-darken-4" icon="mdi-delete"
@click="go.data.tasks.splice(i, 1)"></v-btn>
</v-list-item-title>
</v-list-item>
</v-list-group>
</v-list-group>
</v-list>
<template v-for="(item, i) in flatItems" :key="i">
<component :is="components[item.__type]" :ref="'svg-'+item.id" :vd="item.vd" v-model="item.data"
@@ -148,6 +104,7 @@ export default {
mounted(){
window.addEventListener('resize', this.resize);
this.resize();
this.object.scenes = this.object.scenes || [];
},
unmounted(){
window,removeEventListener('resize', this.resize);
@@ -184,12 +141,12 @@ export default {
i.__type = 'Scene';
i.__path = `scene-${ii.toString().padStart(4, '0')}`;
i.__level = 1;
i.data?.gameObjects?.forEach((go, igo)=>{
i.data?.items?.forEach((go, igo)=>{
go.__parent = i;
go.__type = 'GameObject';
go.__path = `${i.__path}.go-${igo.toString().padStart(4, '0')}`
go.__level = 2;
go.data.tasks?.forEach((t, it)=>{
go.data.items?.forEach((t, it)=>{
fi.push(t);
t.__parent = go;
t.__type = 'Task';
@@ -318,22 +275,19 @@ export default {
let id, nid = 1;
do {
id = `${this.components[this.mode].name}-${nid++}`
}while (this.flatItems.find(i=>i.id == id));
}while (this.flatItems.find(i=>i.data.id == id));
let targetContainer = this.selectedItem[0]?.data; //this.items;
if (this.mode == 'GameObject'){
targetContainer.gameObjects = targetContainer.gameObjects || [];
targetContainer = targetContainer.gameObjects;
}else if(this.mode == 'Task'){
targetContainer.tasks = targetContainer.tasks || [];
targetContainer = targetContainer.tasks;
if (targetContainer){
targetContainer.items = targetContainer.items || [];
targetContainer = targetContainer.items;
}else{
targetContainer = this.items
}
targetContainer.push({
//__type: this.mode,
vd: this.target.target,
data: { title: id },
data: { title: id, id },
visible: true
})
}
@@ -375,6 +329,11 @@ export default {
setTarget(t, item){
this.target = t;
this.selectedItem = [item]
let i = item;
while (i){
i.vd.expanded = true;
i = i.__parent;
}
},
select(){
let r = Utils.adjustMinMax(this.selector);
@@ -386,6 +345,11 @@ export default {
this.viewBox.h = r.clientHeight;
//this.zoom = Math.min(r.clientWidth / this.viewBox.w, r.clientHeight / this.viewBox.h);
},
remove(item){
//console.log(item);
let p = item.__parent?.data?.items || this.items;
p.splice(p.indexOf(item), 1);
}
}
}
</script>
src/components/SceneDesigner/Task.vue
+4 -3
View File
@@ -1,8 +1,9 @@
<template>
<teleport to=".scene-designer" v-if="active">
<g @mousedown="$emit('target', {target:vd, attrs:['x1', 'y1'], delta: true})" :class="{task: true, selected}" v-show="visible && parent.visible">
<teleport to=".scene-designer .tasks" v-if="active">
<g @mousedown="$emit('target', {target:vd, attrs:['x1', 'y1'], delta: true})" :class="{task: true, selected}"
v-show="visible && parent.visible && parent.__parent.visible">
<line :x1="vd.x1" :y1="vd.y1" :x2="parent.vd.x1" :y2="parent.vd.y1"></line>
<svg-icon :src="`/asset/thumb/${modelValue.id||0}.webp`" :x="vd.x1" :y="vd.y1" :size="22"></svg-icon>
<svg-icon :src="`/asset/thumb/0.webp`" :x="vd.x1" :y="vd.y1" :size="22"></svg-icon>
</g>
</teleport>
<v-card v-if="selected">