Skip to content

Commit b33a9fa

Browse files
EepyBerryEepyBerry
committed
Update version, prettify code
1 parent 699f4ee commit b33a9fa

15 files changed

+125
-128
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lagrange",
3-
"version": "0.4.3-SNAPSHOT",
3+
"version": "0.4.3",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -74,4 +74,4 @@
7474
"vite": "^6.1.0",
7575
"vue-tsc": "^2.2.2"
7676
}
77-
}
77+
}

‎src/components/controls/ControlsRings.vue‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
<template #content>
1010
<template v-for="(b, index) in LG_PLANET_DATA.ringsParams" :key="b.id">
1111
<!-- prettier-ignore-attribute -->
12-
<ParameterRing
13-
v-model="LG_PLANET_DATA.ringsParams[index]"
14-
:index="index"
15-
@delete="deleteRing"
16-
/>
12+
<ParameterRing v-model="LG_PLANET_DATA.ringsParams[index]" :index="index" @delete="deleteRing" />
1713
</template>
1814
<button class="lg action-add" @click="addRing">
1915
<iconify-icon class="icon" icon="mingcute:add-line" width="1.25rem" aria-hidden="true" />
@@ -30,12 +26,7 @@ import { LG_PLANET_DATA } from '@core/services/planet-editor.service'
3026
import ParameterRing from '../parameters/ParameterRing.vue'
3127
3228
function addRing() {
33-
const newRing = new RingParameters(
34-
LG_PLANET_DATA.value.changedProps,
35-
'_ringsParameters',
36-
1.5,
37-
1.75
38-
)
29+
const newRing = new RingParameters(LG_PLANET_DATA.value.changedProps, '_ringsParameters', 1.5, 1.75)
3930
LG_PLANET_DATA.value.ringsParams.push(newRing)
4031
LG_PLANET_DATA.value.markForChange('_ringsParameters')
4132
}
@@ -53,4 +44,4 @@ function deleteRing(id: string) {
5344
.action-add {
5445
grid-column: span 2;
5546
}
56-
</style>
47+
</style>

‎src/components/controls/PlanetInfoControls.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ const saveFloating = useFloating(saveMenuTrigger, saveMenu, {
143143
})
144144
// floating-ui end
145145
146-
watch(() => EventBus.clickEvent.value, (evt) => onWindowClick(evt!))
146+
watch(
147+
() => EventBus.clickEvent.value,
148+
(evt) => onWindowClick(evt!),
149+
)
147150
148151
defineProps<{ compactMode: boolean }>()
149152
const $emit = defineEmits(['rename', 'reset', 'save', 'copy', 'gltf', 'random'])

‎src/components/dialogs/AppPlanetInfoDialog.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191
<span class="deco-polygon">
9292
<span class="hole"></span>
9393
</span>
94-
<template v-if="planet?.data.biomesEnabled && planet?.data.biomesParams.length && planet?.data.biomesParams.length > 0">
94+
<template
95+
v-if="
96+
planet?.data.biomesEnabled && planet?.data.biomesParams.length && planet?.data.biomesParams.length > 0
97+
"
98+
>
9599
<h3>{{ $t('dialog.planetinfo.biomes') }}</h3>
96100
<table class="compact-header">
97101
<tbody>

‎src/components/parameters/ParameterRing.vue‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
<button class="lg icon-button" @click="toggleExpand()" @keydown.enter="toggleExpand()">
66
<iconify-icon class="indicator" icon="mingcute:right-fill" width="1.25rem" aria-hidden="true" />
77
</button>
8-
<span
9-
class="current-color"
10-
:style="{ background: colorRampToStyle(lgParam!.colorRamp).color }"
11-
>
12-
<div
13-
class="alpha-color"
14-
:style="{ background: colorRampToStyle(lgParam!.colorRamp).alpha }"
15-
></div>
8+
<span class="current-color" :style="{ background: colorRampToStyle(lgParam!.colorRamp).color }">
9+
<div class="alpha-color" :style="{ background: colorRampToStyle(lgParam!.colorRamp).alpha }"></div>
1610
</span>
1711
<span class="ring-index">{{ getPartialId() }}</span>
1812
</div>
@@ -30,21 +24,17 @@
3024
<ParameterSlider :id="lgParam!.id + '-r-outer'" v-model="lgParam!.outerRadius" :step="0.01" :min="1.25" :max="5">
3125
{{ $t('editor.controls.ring.transform_radius_outer') }}
3226
</ParameterSlider>
33-
<ParameterColorRamp
34-
:key="lgParam!.id"
35-
v-model="lgParam!.colorRamp"
36-
mode="rgba"
37-
>
27+
<ParameterColorRamp :key="lgParam!.id" v-model="lgParam!.colorRamp" mode="rgba">
3828
{{ $t('editor.general.noise_rgbaramp') }}
3929
</ParameterColorRamp>
4030
</div>
4131
</div>
4232
</template>
4333

4434
<script setup lang="ts">
45-
import type { RingParameters } from '@/core/models/ring-parameters.model';
46-
import { colorRampToStyle } from '@/utils/utils';
47-
import { onMounted, ref, type Ref } from 'vue';
35+
import type { RingParameters } from '@/core/models/ring-parameters.model'
36+
import { colorRampToStyle } from '@/utils/utils'
37+
import { onMounted, ref, type Ref } from 'vue'
4838
4939
const lgParam = defineModel<RingParameters>()
5040
@@ -63,7 +53,6 @@ function getPartialId() {
6353
}
6454
</script>
6555

66-
6756
<style scoped lang="scss">
6857
.ring-grid {
6958
grid-column: span 2;
@@ -140,4 +129,4 @@ strong {
140129
}
141130
}
142131
}
143-
</style>
132+
</style>

‎src/core/helpers/compatibility.helper.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { ColorRamp } from "../models/color-ramp.model"
2-
import type PlanetData from "../models/planet-data.model"
3-
import { RingParameters } from "../models/ring-parameters.model"
1+
import type { ColorRamp } from '../models/color-ramp.model'
2+
import type PlanetData from '../models/planet-data.model'
3+
import { RingParameters } from '../models/ring-parameters.model'
44

55
type LegacyRingPlanetData = PlanetData & {
66
_id: string
@@ -29,4 +29,4 @@ export function convertLegacyRingStorage(self: PlanetData, legacyData: LegacyRin
2929
convertedParams.id = legacyData._id ? legacyData._id : convertedParams.id
3030
self.ringsParams.push(convertedParams)
3131
}
32-
}
32+
}

‎src/core/helpers/import.helper.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import PlanetData from '../models/planet-data.model'
33
import pako from 'pako'
44
import { nanoid } from 'nanoid'
55

6-
export async function readFileSettings(json: File): Promise<{ settings: IDBSettings, keyBindings: IDBKeyBinding[] }> {
7-
return new Promise<{ settings: IDBSettings, keyBindings: IDBKeyBinding[] }>((resolve, reject) => {
6+
export async function readFileSettings(json: File): Promise<{ settings: IDBSettings; keyBindings: IDBKeyBinding[] }> {
7+
return new Promise<{ settings: IDBSettings; keyBindings: IDBKeyBinding[] }>((resolve, reject) => {
88
const reader = new FileReader()
99
reader.onload = (e) => {
1010
if (!e.target || !e.target?.result) {
@@ -57,4 +57,4 @@ function readFileV1(rawData: PlanetData): IDBPlanet | undefined {
5757
console.error(err)
5858
return undefined
5959
}
60-
}
60+
}

‎src/core/helpers/uniform.helper.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ const UNIFORM_UPDATE_MAP: Ref<Map<string, () => void>> = ref(new Map<string, ()
1515

1616
export function initUniformUpdateMap(sceneData: PlanetSceneData, planetData: PlanetData, texBufs: Uint8Array[]) {
1717
registerLightingDataUpdates(planetData, sceneData.sunLight!, sceneData.ambLight!, sceneData.lensFlare!)
18-
registerPlanetRenderingDataUpdates(planetData, sceneData.planetGroup!, sceneData.planet!, sceneData.atmosphere!, sceneData.clouds!)
18+
registerPlanetRenderingDataUpdates(
19+
planetData,
20+
sceneData.planetGroup!,
21+
sceneData.planet!,
22+
sceneData.atmosphere!,
23+
sceneData.clouds!,
24+
)
1925
registerSurfaceDataUpdates(planetData, sceneData.planet!, sceneData.surfaceDataTex!, texBufs[0])
2026
registerBiomeDataUpdates(planetData, sceneData.planet!, sceneData.biomeDataTex!, texBufs[1])
2127
registerCloudDataUpdates(planetData, sceneData.clouds!, sceneData.cloudsDataTex!, texBufs[2])
@@ -24,10 +30,10 @@ export function initUniformUpdateMap(sceneData: PlanetSceneData, planetData: Pla
2430
}
2531

2632
export function reloadRingDataUpdates(sceneData: PlanetSceneData, planetData: PlanetData) {
27-
const ringKeys = [...UNIFORM_UPDATE_MAP.value.keys()].filter(k => k.startsWith('_ringsParameters'))
28-
ringKeys.forEach(k => {
33+
const ringKeys = [...UNIFORM_UPDATE_MAP.value.keys()].filter((k) => k.startsWith('_ringsParameters'))
34+
ringKeys.forEach((k) => {
2935
UNIFORM_UPDATE_MAP.value.delete(k)
30-
});
36+
})
3137
registerRingsDataUpdates(planetData, sceneData.rings!)
3238
}
3339

‎src/core/models/biome-parameters.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class BiomeParameters extends ChangeTracker {
2525
dims: BiomeDimensions,
2626
color: Color,
2727
smoothness: number,
28-
oldId?: string
28+
oldId?: string,
2929
) {
3030
super(changedPropsRef, changePrefix)
3131
this._id = oldId ?? nanoid()

‎src/core/models/planet-data.model.ts‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -692,21 +692,22 @@ export default class PlanetData extends ChangeTracker {
692692
this.biomesParams.splice(0)
693693
this.biomesParams.push(
694694
// eslint-disable-next-line @typescript-eslint/no-explicit-any
695-
...(data._biomesParams ?? []).map((params: any) =>
696-
new BiomeParameters(
697-
this.changedProps,
698-
'_biomesParameters',
699-
{
700-
temperatureMin: params._tempMin ?? 0.0,
701-
temperatureMax: params._tempMax ?? 0.5,
702-
humidityMin: params._humiMin ?? 0.0,
703-
humidityMax: params._humiMax ?? 1.0,
704-
},
705-
new Color(params._color),
706-
params._smoothness ?? 0.25,
707-
params._id
708-
)
709-
)
695+
...(data._biomesParams ?? []).map(
696+
(params: any) =>
697+
new BiomeParameters(
698+
this.changedProps,
699+
'_biomesParameters',
700+
{
701+
temperatureMin: params._tempMin ?? 0.0,
702+
temperatureMax: params._tempMax ?? 0.5,
703+
humidityMin: params._humiMin ?? 0.0,
704+
humidityMax: params._humiMax ?? 1.0,
705+
},
706+
new Color(params._color),
707+
params._smoothness ?? 0.25,
708+
params._id,
709+
),
710+
),
710711
)
711712

712713
// Clouds
@@ -741,16 +742,17 @@ export default class PlanetData extends ChangeTracker {
741742
this.ringsParams.splice(0)
742743
this.ringsParams.push(
743744
// eslint-disable-next-line @typescript-eslint/no-explicit-any
744-
...(data._ringsParams ?? []).map((params: any) =>
745-
new RingParameters(
746-
this.changedProps,
747-
'_ringsParameters',
748-
params._innerRadius ?? 1.25,
749-
params._outerRadius ?? 1.5,
750-
params._colorRamp?._steps,
751-
params._id
752-
)
753-
)
745+
...(data._ringsParams ?? []).map(
746+
(params: any) =>
747+
new RingParameters(
748+
this.changedProps,
749+
'_ringsParameters',
750+
params._innerRadius ?? 1.25,
751+
params._outerRadius ?? 1.5,
752+
params._colorRamp?._steps,
753+
params._id,
754+
),
755+
),
754756
)
755757

756758
// Compatibility & conversion calls

0 commit comments

Comments
 (0)