Skip to content
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

Jump to bottom

UI tweaks and solve ImageEntity bug. #101

Merged
merged 8 commits into from Jan 4, 2023
Merged

UI tweaks and solve ImageEntity bug. #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8809402
Remove extraneous padding from the explore app lists
Jan 3, 2023
7af23f2
Evened the spacing on the about items
Jan 3, 2023
0aa5be3
Fix for transparency on PNG image entities
Jan 3, 2023
4e4553f
Better initial sizing for the Ready Player Me dialog
Jan 3, 2023
eec62ff
Avatar app better default positioning and size
Jan 3, 2023
153cabe
Add padding to the bottom of the About menu
Gigabyte5671 Jan 4, 2023
b4518f0
Remove unnecessary separator from the Settings menu
Gigabyte5671 Jan 4, 2023
e2bd4f5
Improve the spacing of toolbar elements on mobile
Gigabyte5671 Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/components/overlays/avatar/Avatar.vue
View file
Open in desktop
Expand Up @@ -72,9 +72,10 @@
icon="directions_run"
title="Avatar"
:managerProps="propsToPass"
:defaultHeight="450"
:defaultHeight="730"
:defaultWidth="380"
:defaultLeft="300"
:defaultLeft="250"
:defaultTop="50"
:hoverShowBar="false"
:style="{
'box-shadow': '0 1px 5px rgb(0 0 0 / 20%), 0 2px 2px rgb(0 0 0 / 14%), 0 3px 1px -2px rgb(0 0 0 / 12%)',
Expand Down
4 changes: 2 additions & 2 deletions src/components/overlays/explore/Explore.vue
View file
Open in desktop
Expand Up @@ -323,7 +323,7 @@
<q-tab name="bookmarks" label="Bookmarks" />
</q-tabs>
<q-tab-panels v-model="tab" animated class="full-height">
<q-tab-panel name="all">
<q-tab-panel name="all" class="q-pa-none">
<q-list :showing="!loading">
<q-item
v-for="place in filteredAndSortedData"
Expand Down Expand Up @@ -376,7 +376,7 @@
</q-item>
</q-list>
</q-tab-panel>
<q-tab-panel name="bookmarks" class="full-height">
<q-tab-panel name="bookmarks" class="full-height q-pa-none">
<q-list :showing="!loading">
<p
v-if="$store.state.bookmarks.locations.length <= 0"
Expand Down
3 changes: 2 additions & 1 deletion src/components/overlays/rpm/ReadyPlayerMe.vue
View file
Open in desktop
Expand Up @@ -17,9 +17,10 @@
icon="face"
title="Ready Player Me"
:managerProps="propsToPass"
:defaultHeight="600"
:defaultHeight="800"
:defaultWidth="800"
:defaultLeft="300"
:defaultTop="10"
:hoverShowBar="false"
:style="{
'box-shadow': '0 1px 5px rgb(0 0 0 / 20%), 0 2px 2px rgb(0 0 0 / 14%), 0 3px 1px -2px rgb(0 0 0 / 12%)',
Expand Down
28 changes: 21 additions & 7 deletions src/layouts/MainLayout.vue
View file
Open in desktop
Expand Up @@ -76,7 +76,10 @@
icon="menu"
aria-label="User Menu"
@click="toggleUserMenu"
class="q-mr-sm"
:class="{
'q-mr-sm': isDesktop,
'q-mr-xs': isMobile
}"
/>
<q-separator dark vertical inset />

Expand All @@ -91,7 +94,10 @@
class="q-mr-sm q-ml-sm"
/>

<div class="verticalAudioLevel q-my-auto">
<div
class="verticalAudioLevel q-my-auto"
:class="{ 'q-ml-sm': isMobile }"
>
<span
:class="`text-${microphoneColor}`"
:style="{ height: `${AudioIOInstance.inputLevel}%` }"
Expand Down Expand Up @@ -165,9 +171,14 @@
>Please allow microphone access.</q-tooltip>
</div>

<q-toolbar-title>
<q-toolbar-title
:class="{ 'q-px-xs': isMobile }"
>
<q-item-section>
<q-item-label :style="{ fontSize: isMobile ? '0.8em' : 'inherit' }" :title="getDomainServerState">
<q-item-label
:style="{ fontSize: isMobile ? '0.8em' : 'inherit' }"
:title="getDomainServerState"
>
{{ getDomainServerState }}
<q-spinner
v-if="getDomainServerState === 'CONNECTING'"
Expand Down Expand Up @@ -263,7 +274,7 @@
<img :src="$store.state.theme.logo">
</q-avatar>
</template>
<q-list>
<q-list class="q-pb-sm">
<template v-if="isMobile">
<q-item-label header>Account</q-item-label>
<q-item clickable v-ripple
Expand Down Expand Up @@ -393,11 +404,14 @@
</q-item>
<q-separator inset spaced />
<q-item-label header>About</q-item-label>
<q-item-label></q-item-label>
<q-item>
<q-item-section>
<q-item-label>{{ $store.state.globalConsts.APP_NAME }}</q-item-label>
<q-item-label caption>{{ $store.state.globalConsts.APP_VERSION_TAG }}</q-item-label>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-item-label>Vircadia Web SDK</q-item-label>
<q-item-label caption>{{ $store.state.globalConsts.SDK_VERSION_TAG }}</q-item-label>
</q-item-section>
Expand Down Expand Up @@ -516,7 +530,7 @@ export default defineComponent({
Log.info(Log.types.OTHER, "Toggle Dark");
},
isCategory: false,
separator: true
separator: false
}
],
settingsMenuState: false,
Expand Down
5 changes: 5 additions & 0 deletions src/modules/entity/components/components/image.ts
View file
Open in desktop
Expand Up @@ -122,6 +122,11 @@ export class ImageComponent extends MeshComponent {
mat.emissiveTexture = texture;
}

if (mat.diffuseTexture !== null && assetURL.fileExtension === "png") {
mat.diffuseTexture.hasAlpha = true;
mat.useAlphaFromDiffuseTexture = true;
}

this._mesh.material = mat;
this._mesh.isVisible = entity.visible ?? true;

Expand Down