Skip to content

Fix live preview sync in bitmap creator #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rom98759 wants to merge 1 commit into
base: master
Choose a base branch
from
+70 −58
Open

Fix live preview sync in bitmap creator #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/components/Art.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<template>
<div id="art" :style="{ width: getWidth(), height: getHeight() }">
<Pixel :coloring="color" :id="p" :func="func" :pixelDimensions="getPixelDimensions()" v-for="p in getPixelCount()" :key="p" />
<Pixel
:background="getPixelBackground(p)"
:coloring="color"
:id="p"
:func="func"
:pixelDimensions="getPixelDimensions()"
v-for="p in getPixelCount()"
:key="p"
/>
</div>
</template>
<script>
Expand All @@ -24,6 +32,10 @@ export default {
type: Function,
required: true,
},
backgrounds: {
type: Array,
required: true,
},
},
components: {
Pixel,
Expand Down Expand Up @@ -53,6 +65,9 @@ export default {
return '25';
}
},
getPixelBackground(pixelId) {
return this.backgrounds[pixelId - 1] || '#000000';
},
},
};
</script>
Expand Down
22 changes: 7 additions & 15 deletions src/components/Pixel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<template>
<div class="pixel" :id="id" :style="{ background: activeBackground, height: getPixel(), width: getPixel() }" @click="changeColor"></div>
<div class="pixel" :id="id" :style="{ background: background, height: getPixel(), width: getPixel() }" @click="changeColor"></div>
</template>
<script>
export default {
data() {
return {
activeBackground: '#000',
};
},
created() {
this.func(this.id, this.activeBackground);
},
props: {
background: {
type: String,
required: true,
},
coloring: {
type: String,
required: true,
Expand All @@ -31,12 +27,8 @@ export default {
},
methods: {
changeColor() {
if (this.activeBackground == this.coloring) {
this.activeBackground = '#000';
} else {
this.activeBackground = this.coloring;
}
this.func(this.id, this.activeBackground);
const activeBackground = this.background === this.coloring ? '#000000' : this.coloring;
this.func(this.id, activeBackground);
},
getPixel() {
return this.pixelDimensions + 'px';
Expand Down
89 changes: 47 additions & 42 deletions src/views/Creator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<v-row v-if="pixelMode == 0">
<v-col cols="12" lg="4" offset-lg="2">
<v-card class="pa-3" elevation="4">
<Art :colors="colors" pixelCount="64" :func="onclick" />
<Art :colors="colors" pixelCount="64" :func="onclick" :backgrounds="active8x8Background" />
<p></p>
<v-textarea filled outlined v-model="array8x8String" rows="5" hide-details></v-textarea>
<v-switch v-model="livedraw" label="Live draw" hide-details dense></v-switch>
Expand All @@ -36,16 +36,16 @@
<v-row v-if="pixelMode == 1">
<v-col cols="12" lg="8" offset-lg="0">
<v-card class="pa-3" elevation="4">
<Art :colors="colors" pixelCount="256" :func="onclick" />
<Art :colors="colors" pixelCount="256" :func="onclick" :backgrounds="active8x32Background" />
<p></p>
<v-textarea filled outlined v-model="array8x32String" rows="9" hide-details></v-textarea>
<v-switch v-model="livedraw" label="Live draw" :disabled="!sockedIsConnected" hide-details dense></v-switch>
<div class="text-center" v-if="isAnimated" >
<v-textarea filled outlined v-model="array8x32String" rows="9" hide-details></v-textarea>
<v-switch v-model="livedraw" label="Live draw" :disabled="!sockedIsConnected" hide-details dense></v-switch>
<div class="text-center" v-if="isAnimated" >
<v-card-text><h3 class="red--text">No animated 8x32 bitmaps are supported!</h3></v-card-text>
</div>
<div class="text-center">
</div>
<div class="text-center">
<ButtonSave color="green" text ="Save" icon="mdi-content-save" :data="array8x32String" :pixelMode="pixelMode" :condition="!isAnimated"></ButtonSave>
</div>
</div>
</v-card>
</v-col>
<v-col cols="12" lg="4">
Expand All @@ -64,10 +64,10 @@ export default {
return {
colors: '#F44336',
pixelMode: 0,
active8x8Background: {},
active8x32Background: {},
array8x8String: '',
array8x32String: '',
active8x8Background: Array.from({ length: 64 }, () => '#000000'),
active8x32Background: Array.from({ length: 256 }, () => '#000000'),
array8x8String: `[${Array.from({ length: 64 }, () => 0).join(',')}]`,
array8x32String: `[${Array.from({ length: 256 }, () => 0).join(',')}]`,
livedraw: false,
};
},
Expand All @@ -83,40 +83,22 @@ export default {
return this.cleaned8x32String.includes('],[');
},
},
watch: {
array8x8String(value) {
this.active8x8Background = parseBitmapString(value, 64);
},
array8x32String(value) {
this.active8x32Background = parseBitmapString(value, 256);
},
},
methods: {
onclick(id, color) {
if (Object.keys(this.active8x32Background).length < 256) {
for (let i = 1; i < 256; i++) {
this.active8x32Background[i] = '000';
}
}

if (Object.keys(this.active8x8Background).length < 64) {
for (let i = 1; i < 64; i++) {
this.active8x8Background[i] = '000';
}
}

if (this.pixelMode == 0) {
this.active8x8Background[id] = color.replace('#', '');
this.array8x8String = '[';

for (const hex of Object.values(this.active8x8Background)) {
this.array8x8String += rgb888ToRgb565(hexToRgb(hex)) + ',';
}

this.array8x8String = this.array8x8String.slice(0, -1);
this.array8x8String += ']';
this.$set(this.active8x8Background, id - 1, color);
this.array8x8String = bitmapArrayToString(this.active8x8Background);
} else {
this.active8x32Background[id] = color.replace('#', '');
this.array8x32String = '[';

for (const hex of Object.values(this.active8x32Background)) {
this.array8x32String += rgb888ToRgb565(hexToRgb(hex)) + ',';
}

this.array8x32String = this.array8x32String.slice(0, -1);
this.array8x32String += ']';
this.$set(this.active8x32Background, id - 1, color);
this.array8x32String = bitmapArrayToString(this.active8x32Background);
}

if (this.livedraw) {
Expand Down Expand Up @@ -161,10 +143,33 @@ export default {
},
};

function parseBitmapString(value, size) {
const matches = value.match(/\d+/g);
const parsedValues = matches ? matches.slice(0, size).map((number) => rgb565ToHex(Number(number))) : [];

return Array.from({ length: size }, (_, index) => parsedValues[index] || '#000000');
}

function bitmapArrayToString(backgrounds) {
const values = backgrounds.map((hex) => rgb888ToRgb565(hexToRgb(hex.replace('#', ''))));

return `[${values.join(',')}]`;
}

function rgb888ToRgb565(rgbArray) {
return ((rgbArray.r & 0xf8) << 8) + ((rgbArray.g & 0xfc) << 3) + (rgbArray.b >> 3);
}

function rgb565ToHex(rgb565) {
const red = ((rgb565 >> 11) & 0x1f) << 3;
const green = ((rgb565 >> 5) & 0x3f) << 2;
const blue = (rgb565 & 0x1f) << 3;

return `#${[red, green, blue]
.map((value) => value.toString(16).padStart(2, '0'))
.join('')}`;
}

function hexToRgb(hex) {
const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
hex = hex.replace(shorthandRegex, function (m, r, g, b) {
Expand Down