Merge branch 'develop' into vite
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { derived, get, writable } from "svelte/store";
|
||||
import type { CoWebsite } from "../WebRtc/CoWebsiteManager";
|
||||
import { derived, writable } from "svelte/store";
|
||||
import type { CoWebsite } from "../WebRtc/CoWebsite/CoWesbite";
|
||||
|
||||
function createCoWebsiteStore() {
|
||||
const { subscribe, set, update } = writable(Array<CoWebsite>());
|
||||
@@ -9,7 +9,7 @@ function createCoWebsiteStore() {
|
||||
return {
|
||||
subscribe,
|
||||
add: (coWebsite: CoWebsite, position?: number) => {
|
||||
coWebsite.state.subscribe((value) => {
|
||||
coWebsite.getStateSubscriber().subscribe((value) => {
|
||||
update((currentArray) => currentArray);
|
||||
});
|
||||
|
||||
@@ -31,7 +31,7 @@ function createCoWebsiteStore() {
|
||||
},
|
||||
remove: (coWebsite: CoWebsite) => {
|
||||
update((currentArray) => [
|
||||
...currentArray.filter((currentCoWebsite) => currentCoWebsite.iframe.id !== coWebsite.iframe.id),
|
||||
...currentArray.filter((currentCoWebsite) => currentCoWebsite.getId() !== coWebsite.getId()),
|
||||
]);
|
||||
},
|
||||
empty: () => {
|
||||
@@ -43,9 +43,9 @@ function createCoWebsiteStore() {
|
||||
export const coWebsites = createCoWebsiteStore();
|
||||
|
||||
export const coWebsitesNotAsleep = derived([coWebsites], ([$coWebsites]) =>
|
||||
$coWebsites.filter((coWebsite) => get(coWebsite.state) !== "asleep")
|
||||
$coWebsites.filter((coWebsite) => coWebsite.getState() !== "asleep")
|
||||
);
|
||||
|
||||
export const mainCoWebsite = derived([coWebsites], ([$coWebsites]) =>
|
||||
$coWebsites.find((coWebsite) => get(coWebsite.state) !== "asleep")
|
||||
$coWebsites.find((coWebsite) => coWebsite.getState() !== "asleep")
|
||||
);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { derived, get, writable } from "svelte/store";
|
||||
import type { CoWebsite } from "../WebRtc/CoWebsiteManager";
|
||||
import type { CoWebsite } from "../WebRtc/CoWebsite/CoWesbite";
|
||||
import { LayoutMode } from "../WebRtc/LayoutManager";
|
||||
import { coWebsites } from "./CoWebsiteStore";
|
||||
import { Streamable, streamableCollectionStore } from "./StreamableCollectionStore";
|
||||
@@ -31,7 +31,7 @@ function createHighlightedEmbedScreenStore() {
|
||||
embedScreen.type !== currentEmbedScreen.type ||
|
||||
(embedScreen.type === "cowebsite" &&
|
||||
currentEmbedScreen.type === "cowebsite" &&
|
||||
embedScreen.embed.iframe.id !== currentEmbedScreen.embed.iframe.id) ||
|
||||
embedScreen.embed.getId() !== currentEmbedScreen.embed.getId()) ||
|
||||
(embedScreen.type === "streamable" &&
|
||||
currentEmbedScreen.type === "streamable" &&
|
||||
embedScreen.embed.uniqueId !== currentEmbedScreen.embed.uniqueId)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { derived, writable } from "svelte/store";
|
||||
import type { ActivatablesManager } from "../Phaser/Game/ActivatablesManager";
|
||||
import type { UserInputManager } from "../Phaser/UserInput/UserInputManager";
|
||||
|
||||
export interface LayoutManagerAction {
|
||||
|
||||
@@ -5,38 +5,33 @@ export function createColorStore() {
|
||||
|
||||
let followColor: number | undefined = undefined;
|
||||
let apiColor: number | undefined = undefined;
|
||||
|
||||
let pointedByPointer: boolean = false;
|
||||
let pointedByCharacter: boolean = false;
|
||||
let pointedByPointer: number | undefined = undefined;
|
||||
let pointedByCharacter: number | undefined = undefined;
|
||||
|
||||
const updateColor = () => {
|
||||
if (pointedByPointer || pointedByCharacter) {
|
||||
set(0xffff00);
|
||||
} else {
|
||||
set(followColor ?? apiColor);
|
||||
}
|
||||
set(pointedByPointer ?? pointedByCharacter ?? followColor ?? apiColor);
|
||||
};
|
||||
|
||||
return {
|
||||
subscribe,
|
||||
|
||||
pointerOver() {
|
||||
pointedByPointer = true;
|
||||
pointerOver(color: number) {
|
||||
pointedByPointer = color;
|
||||
updateColor();
|
||||
},
|
||||
|
||||
pointerOut() {
|
||||
pointedByPointer = false;
|
||||
pointedByPointer = undefined;
|
||||
updateColor();
|
||||
},
|
||||
|
||||
characterCloseBy() {
|
||||
pointedByCharacter = true;
|
||||
characterCloseBy(color: number) {
|
||||
pointedByCharacter = color;
|
||||
updateColor();
|
||||
},
|
||||
|
||||
characterFarAway() {
|
||||
pointedByCharacter = false;
|
||||
pointedByCharacter = undefined;
|
||||
updateColor();
|
||||
},
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import { Readable, writable } from "svelte/store";
|
||||
|
||||
/**
|
||||
* A store that contains the map starting layers names
|
||||
*/
|
||||
export const startLayerNamesStore = writable<string[]>([]);
|
||||
Reference in New Issue
Block a user