_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
_Bastler 2021-05-17 15:24:56 +02:00
parent 16aa859844
commit cad36a7e40
5 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/dist/index.tmpl.html vendored
View File

@ -145,4 +145,4 @@
</body> </body>
</html> </html>

1
front/dist/resources/style/style.css vendored
View File

@ -46,6 +46,7 @@ body .message-info.warning {
position: relative; position: relative;
transition: all 0.2s ease; transition: all 0.2s ease;
cursor: url('/resources/logos/cursor_pointer.png'), pointer; cursor: url('/resources/logos/cursor_pointer.png'), pointer;
height: 100%;
} }
.video-container i { .video-container i {

8
front/src/Phaser/Menu/HelpCameraSettingsScene.ts
View File

@ -24,7 +24,7 @@ export class HelpCameraSettingsScene extends DirtyScene {
this.createHelpCameraSettings(); this.createHelpCameraSettings();
} }
private createHelpCameraSettings(): void { private createHelpCameraSettings() : void {
const middleX = this.getMiddleX(); const middleX = this.getMiddleX();
this.helpCameraSettingsElement = this.add.dom(middleX, -800, undefined, {overflow: 'scroll'}).createFromCache(helpCameraSettings); this.helpCameraSettingsElement = this.add.dom(middleX, -800, undefined, {overflow: 'scroll'}).createFromCache(helpCameraSettings);
this.revealMenusAfterInit(this.helpCameraSettingsElement, helpCameraSettings); this.revealMenusAfterInit(this.helpCameraSettingsElement, helpCameraSettings);
@ -36,7 +36,7 @@ export class HelpCameraSettingsScene extends DirtyScene {
event.preventDefault(); event.preventDefault();
if((event?.target as HTMLInputElement).id === 'helpCameraSettingsFormRefresh') { if((event?.target as HTMLInputElement).id === 'helpCameraSettingsFormRefresh') {
window.location.reload(); window.location.reload();
} else if((event?.target as HTMLInputElement).id === 'helpCameraSettingsFormContinue') { }else if((event?.target as HTMLInputElement).id === 'helpCameraSettingsFormContinue') {
this.closeHelpCameraSettingsOpened(); this.closeHelpCameraSettingsOpened();
} }
}); });
@ -51,7 +51,7 @@ export class HelpCameraSettingsScene extends DirtyScene {
}); });
} }
private openHelpCameraSettingsOpened(): void { private openHelpCameraSettingsOpened(): void{
HtmlUtils.getElementByIdOrFail<HTMLDivElement>('webRtcSetup').style.display = 'none'; HtmlUtils.getElementByIdOrFail<HTMLDivElement>('webRtcSetup').style.display = 'none';
this.helpCameraSettingsOpened = true; this.helpCameraSettingsOpened = true;
try{ try{
@ -77,7 +77,7 @@ export class HelpCameraSettingsScene extends DirtyScene {
this.dirty = true; this.dirty = true;
} }
private closeHelpCameraSettingsOpened(): void { private closeHelpCameraSettingsOpened(): void{
const middleX = this.getMiddleX(); const middleX = this.getMiddleX();
/*const helpCameraSettingsInfo = this.helpCameraSettingsElement.getChildByID('helpCameraSettings') as HTMLParagraphElement; /*const helpCameraSettingsInfo = this.helpCameraSettingsElement.getChildByID('helpCameraSettings') as HTMLParagraphElement;
helpCameraSettingsInfo.innerText = ''; helpCameraSettingsInfo.innerText = '';

50
front/src/Phaser/Shaders/OutlinePipeline.ts
View File

@ -16,20 +16,44 @@ export class OutlinePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeli
uniform sampler2D uMainSampler; uniform sampler2D uMainSampler;
uniform vec2 uTextureSize; uniform vec2 uTextureSize;
vec2 onePixel = vec2(1.0, 1.0) / uTextureSize; varying vec2 outTexCoord;
float upAlpha = texture2D(uMainSampler, outTexCoord + vec2(0.0, onePixel.y)).a; varying float outTintEffect;
float leftAlpha = texture2D(uMainSampler, outTexCoord + vec2(-onePixel.x, 0.0)).a; varying vec4 outTint;
float downAlpha = texture2D(uMainSampler, outTexCoord + vec2(0.0, -onePixel.y)).a;
float rightAlpha = texture2D(uMainSampler, outTexCoord + vec2(onePixel.x, 0.0)).a;
if (texture.a == 0.0 && max(max(upAlpha, downAlpha), max(leftAlpha, rightAlpha)) == 1.0) void main(void)
{ {
color = vec4(1.0, 1.0, 0.0, 1.0); vec4 texture = texture2D(uMainSampler, outTexCoord);
} vec4 texel = vec4(outTint.rgb * outTint.a, outTint.a);
vec4 color = texture;
gl_FragColor = color; if (outTintEffect == 0.0)
} {
` color = texture * texel;
}); }
} else if (outTintEffect == 1.0)
{
color.rgb = mix(texture.rgb, outTint.rgb * outTint.a, texture.a);
color.a = texture.a * texel.a;
}
else if (outTintEffect == 2.0)
{
color = texel;
}
vec2 onePixel = vec2(1.0, 1.0) / uTextureSize;
float upAlpha = texture2D(uMainSampler, outTexCoord + vec2(0.0, onePixel.y)).a;
float leftAlpha = texture2D(uMainSampler, outTexCoord + vec2(-onePixel.x, 0.0)).a;
float downAlpha = texture2D(uMainSampler, outTexCoord + vec2(0.0, -onePixel.y)).a;
float rightAlpha = texture2D(uMainSampler, outTexCoord + vec2(onePixel.x, 0.0)).a;
if (texture.a == 0.0 && max(max(upAlpha, downAlpha), max(leftAlpha, rightAlpha)) == 1.0)
{
color = vec4(1.0, 1.0, 0.0, 1.0);
}
gl_FragColor = color;
}
`
});
}
} }

2
front/src/Phaser/UserInput/UserInputManager.ts
View File

@ -173,7 +173,7 @@ export class UserInputManager {
} }
destroy(): void { destroy(): void {
this.joystick && this.joystick.destroy(); this.joystick?.destroy();
} }
private initMouseWheel() { private initMouseWheel() {