FIXED AND WORKING... BACKUP IF IT GOES WRONG

This commit is contained in:
2022-01-29 15:52:02 +02:00
parent fa4e27999a
commit e11a283b2c
94 changed files with 2174 additions and 62 deletions

9
.prettierrc Normal file
View File

@@ -0,0 +1,9 @@
{
"tabWidth": 2,
"useTabs": false,
"arrowParens": "always",
"singleQuote": true,
"semi": true,
"trailingComma": "all",
"bracketSpacing": true
}

40
.todo
View File

@@ -1,39 +1,43 @@
Setup:
✔ make game canvas @done(22-01-28 20:23)
✔ add a block to canvas movable with keyboard @done(22-01-28 20:53)
create basic socket.io server
connect players to the server
draw other players on canvas
update player position on canvas
create basic socket.io server @done(22-01-28 22:43)
connect players to the server @done(22-01-29 00:51)
draw other players on canvas @done(22-01-29 00:51)
update player position on canvas @done(22-01-29 00:51)
Game:
add physics for player to fall down
add interaction with blocks (and ground)
implement jump
add plyer collision?
add physics for player to fall down @done(22-01-29 02:02)
add interaction with blocks (and ground) @done(22-01-29 11:17)
implement jump @done(22-01-29 02:02)
add plyer collision? @cancelled(22-01-29 11:18)
☐ allow player to enter a name before starting the game
☐ show players names above their heads
restrict some words and name length
add name length limit
Server:
do the same calculations for game logic (maybe use the same code base)
do the same calculations for game logic (maybe use the same code base) @cancelled(22-01-29 11:18)
☐ set player name
IMPLEMENT BANNING PEOPLE
IMPLEMENT BANNING PEOPLE @cancelled(22-01-29 11:18)
Win condition?:
☐ reach some specific height? (premade map)
☐ when time runs out player at the highest point wins? (randomy generated map)
last one standing:
player that is too far back from leading one looses?
player that is too far back from leading one looses? @cancelled(22-01-29 11:19)
☐ last player after specific time is eliminated?
Game art:
randomly generated from assets?
choosing one of preset characters?
character builder?
randomly generated from assets? @cancelled(22-01-29 11:19)
choosing one of preset characters? @cancelled(22-01-29 11:19)
character builder? @cancelled(22-01-29 11:19)
misc:
user accounts to track their score and save their chacaters?
game ratio 9x16?
game ratio 16x9?
user accounts to track their score and save their chacaters? @cancelled(22-01-29 11:18)
game ratio 9x16? @done(22-01-29 11:17)
game ratio 16x9? @cancelled(22-01-29 11:17)
ideas:
✘ block fall off platform if they are 1/3 off it @cancelled(22-01-29 11:18)

96
android/.gitignore vendored Normal file
View File

@@ -0,0 +1,96 @@
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
# Built application files
*.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/
# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
#*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
# Google Services (e.g. APIs or Firebase)
# google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
# Android Profiling
*.hprof
# Cordova plugins for Capacitor
capacitor-cordova-android-plugins
# Copied web assets
app/src/main/assets/public

3
android/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

6
android/.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
</component>
</project>

30
android/.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
</component>
</project>

9
android/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

2
android/app/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
/build/*
!/build/.npmkeep

51
android/app/build.gradle Normal file
View File

@@ -0,0 +1,51 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "lt.rdarius.kawaiijumper"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
repositories {
flatDir{
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation project(':capacitor-android')
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
}
apply from: 'capacitor.build.gradle'
try {
def servicesJSON = file('google-services.json')
if (servicesJSON.text) {
apply plugin: 'com.google.gms.google-services'
}
} catch(Exception e) {
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
}

View File

@@ -0,0 +1,22 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-haptics')
implementation project(':capacitor-keyboard')
implementation project(':capacitor-status-bar')
}
if (hasProperty('postBuildExtras')) {
postBuildExtras()
}

21
android/app/proguard-rules.pro vendored Normal file
View File

@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

View File

@@ -0,0 +1,26 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import android.content.Context;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.getcapacitor.app", appContext.getPackageName());
}
}

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="lt.rdarius.kawaiijumper">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:name="lt.rdarius.kawaiijumper.MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths"></meta-data>
</provider>
</application>
<!-- Permissions -->
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

View File

@@ -0,0 +1,6 @@
{
"appId": "io.ionic.starter",
"appName": "Kawaii-Jumper",
"webDir": "www",
"bundledWebRuntime": false
}

View File

@@ -0,0 +1,18 @@
[
{
"pkg": "@capacitor/app",
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
},
{
"pkg": "@capacitor/haptics",
"classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin"
},
{
"pkg": "@capacitor/keyboard",
"classpath": "com.capacitorjs.plugins.keyboard.KeyboardPlugin"
},
{
"pkg": "@capacitor/status-bar",
"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
}
]

View File

@@ -0,0 +1,5 @@
package lt.rdarius.kawaiijumper;
import com.getcapacitor.BridgeActivity;
public class MainActivity extends BridgeActivity {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>

View File

@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View File

@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Kawaii-Jumper</string>
<string name="title_activity_main">Kawaii-Jumper</string>
<string name="package_name">io.ionic.starter</string>
<string name="custom_url_scheme">io.ionic.starter</string>
</resources>

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:background">@null</item>
</style>
<style name="AppTheme.NoActionBarLaunch" parent="AppTheme.NoActionBar">
<item name="android:background">@drawable/splash</item>
</style>
</resources>

View File

@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />
</widget>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="." />
<cache-path name="my_cache_images" path="." />
</paths>

View File

@@ -0,0 +1,18 @@
package com.getcapacitor.myapp;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() throws Exception {
assertEquals(4, 2 + 2);
}
}

29
android/build.gradle Normal file
View File

@@ -0,0 +1,29 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.3.5'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
apply from: "variables.gradle"
allprojects {
repositories {
google()
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

View File

@@ -0,0 +1,15 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
include ':capacitor-haptics'
project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
include ':capacitor-keyboard'
project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')

24
android/gradle.properties Normal file
View File

@@ -0,0 +1,24 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

Binary file not shown.

View File

@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
android/gradlew vendored Normal file
View File

@@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

89
android/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

5
android/settings.gradle Normal file
View File

@@ -0,0 +1,5 @@
include ':app'
include ':capacitor-cordova-android-plugins'
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
apply from: 'capacitor.settings.gradle'

14
android/variables.gradle Normal file
View File

@@ -0,0 +1,14 @@
ext {
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
androidxActivityVersion = '1.2.0'
androidxAppCompatVersion = '1.2.0'
androidxCoordinatorLayoutVersion = '1.1.0'
androidxCoreVersion = '1.3.2'
androidxFragmentVersion = '1.3.0'
junitVersion = '4.13.1'
androidxJunitVersion = '1.1.2'
androidxEspressoCoreVersion = '3.3.0'
cordovaAndroidVersion = '7.0.0'
}

118
package-lock.json generated
View File

@@ -2426,6 +2426,11 @@
"to-fast-properties": "^2.0.0"
}
},
"@capacitor/android": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.4.0.tgz",
"integrity": "sha512-O2hHGVzdTH2Lsmz58EI8zHY5byEFIWl9KrW60WSrO/tV6u9DpfaUq56FaejvfU27GFXDZkmoQNa33EvDYWp4wA=="
},
"@capacitor/app": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@capacitor/app/-/app-1.1.0.tgz",
@@ -5112,6 +5117,11 @@
"resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
"integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ=="
},
"@socket.io/component-emitter": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz",
"integrity": "sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q=="
},
"@stencil/core": {
"version": "2.12.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.12.1.tgz",
@@ -6186,6 +6196,11 @@
"@babel/helper-define-polyfill-provider": "^0.2.4"
}
},
"backo2": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
},
"balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -7090,8 +7105,7 @@
"core-js": {
"version": "3.20.3",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
"integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
"dev": true
"integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="
},
"core-js-compat": {
"version": "3.20.3",
@@ -7998,6 +8012,29 @@
}
}
},
"engine.io-client": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.1.1.tgz",
"integrity": "sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g==",
"requires": {
"@socket.io/component-emitter": "~3.0.0",
"debug": "~4.3.1",
"engine.io-parser": "~5.0.0",
"has-cors": "1.1.0",
"parseqs": "0.0.6",
"parseuri": "0.0.6",
"ws": "~8.2.3",
"xmlhttprequest-ssl": "~2.0.0",
"yeast": "0.1.2"
},
"dependencies": {
"ws": {
"version": "8.2.3",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
"integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
}
}
},
"engine.io-parser": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
@@ -9478,6 +9515,11 @@
"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
"dev": true
},
"has-cors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
},
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -11894,6 +11936,31 @@
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
"dev": true
},
"ngrx": {
"version": "0.0.1-security",
"resolved": "https://registry.npmjs.org/ngrx/-/ngrx-0.0.1-security.tgz",
"integrity": "sha512-3hYh1th9Arjoh7mA3KvOt7NB/ZGynOwibYUYftovFRAojsqtI+WZpa51JZ0u+INv3Lcvbi5qkJYupar17aLGdg=="
},
"ngx-socket-io": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-4.1.0.tgz",
"integrity": "sha512-p/IxD/hdpF/3+Xu6FFoo1OMIi9+rbqN55smJKE1RSFHAhS0UmRno2soHd1RTG3QXm6hCntp2vvfPE4tn60P5mw==",
"requires": {
"core-js": "^3.0.0",
"reflect-metadata": "^0.1.10",
"socket.io": "^4.0.0",
"socket.io-client": "^4.0.0",
"tslib": "^2.0.0",
"zone.js": "^0.10.1"
},
"dependencies": {
"zone.js": {
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
"integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
}
}
},
"nice-napi": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
@@ -12637,6 +12704,16 @@
"parse5": "^6.0.1"
}
},
"parseqs": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
"integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
},
"parseuri": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
"integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
},
"parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -14851,8 +14928,7 @@
"reflect-metadata": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
"integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
"dev": true
"integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
},
"regenerate": {
"version": "1.4.2",
@@ -15811,6 +15887,30 @@
"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
"integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
},
"socket.io-client": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.4.1.tgz",
"integrity": "sha512-N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ==",
"requires": {
"@socket.io/component-emitter": "~3.0.0",
"backo2": "~1.0.2",
"debug": "~4.3.2",
"engine.io-client": "~6.1.1",
"parseuri": "0.0.6",
"socket.io-parser": "~4.1.1"
},
"dependencies": {
"socket.io-parser": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.1.tgz",
"integrity": "sha512-USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA==",
"requires": {
"@socket.io/component-emitter": "~3.0.0",
"debug": "~4.3.1"
}
}
}
},
"socket.io-parser": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
@@ -17389,6 +17489,11 @@
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
},
"xmlhttprequest-ssl": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
"integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="
},
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -17452,6 +17557,11 @@
"fd-slicer": "~1.1.0"
}
},
"yeast": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
},
"yn": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",

View File

@@ -19,13 +19,16 @@
"@angular/platform-browser": "~13.0.0",
"@angular/platform-browser-dynamic": "~13.0.0",
"@angular/router": "~13.0.0",
"@capacitor/android": "^3.4.0",
"@capacitor/app": "1.1.0",
"@capacitor/core": "3.4.0",
"@capacitor/haptics": "1.1.4",
"@capacitor/keyboard": "1.2.1",
"@capacitor/status-bar": "1.0.7",
"@ionic/angular": "^6.0.0",
"rxjs": "~6.6.0",
"ngrx": "0.0.1-security",
"ngx-socket-io": "^4.1.0",
"rxjs": "^6.6.7",
"socket.io": "^4.4.1",
"tslib": "^2.2.0",
"zone.js": "~0.11.4"

View File

@@ -2,15 +2,10 @@ import { NgModule } from '@angular/core';
import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
const routes: Routes = [
{
path: 'home',
loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
},
{
path: '',
redirectTo: 'home',
pathMatch: 'full'
},
loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
}
];
@NgModule({

View File

@@ -6,11 +6,15 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
import { AppComponent } from './app.component';
import { AppRoutingModule } from './app-routing.module';
import { SocketIoConfig, SocketIoModule } from 'ngx-socket-io';
const config: SocketIoConfig = { url: 'http://localhost:3000', options: {} };
// const config: SocketIoConfig = { url: 'https://ggj2022.rapalis.lt', options: {} };
@NgModule({
declarations: [AppComponent],
entryComponents: [],
imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule, SocketIoModule.forRoot(config)],
providers: [{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
bootstrap: [AppComponent],
})

View File

@@ -0,0 +1,10 @@
import { Vector } from './types.dto';
export const applyGravity = (
currentVelocity: Vector,
deltaTime: number,
): Vector => {
currentVelocity.y += 0.003 * deltaTime;
currentVelocity.y = currentVelocity.y > 0.9 ? 0.9 : currentVelocity.y;
return { ...currentVelocity };
};

27
src/app/home/deltaTime.ts Normal file
View File

@@ -0,0 +1,27 @@
export class DeltaTime {
private lastTick: number;
private static instance: DeltaTime;
private deltaTime: number;
private constructor() {
this.lastTick = Date.now();
}
public static getInstance() {
if (!this.instance) {
this.instance = new DeltaTime();
}
return this.instance;
}
public updateDeltaTime() {
const time = Date.now();
this.deltaTime = time - this.lastTick;
this.lastTick = time;
}
public getDeltaTime(): number {
return this.deltaTime;
}
}

11
src/app/home/drawMap.ts Normal file
View File

@@ -0,0 +1,11 @@
import { MapTile } from '../../../../Kawaii-Jumper-server/src/mapTile';
export const drawMap = (
mapTiles: MapTile[],
context: CanvasRenderingContext2D,
images: HTMLImageElement[],
) => {
for (let tile of mapTiles) {
context.drawImage(images[tile.color], tile.x, tile.y, tile.w, tile.h);
}
};

View File

@@ -0,0 +1,5 @@
import { Vector } from './types.dto';
export const getAngleBetweenTwoPoints = (p1: Vector, p2: Vector): number => {
return Math.atan2(p2.y - p1.y, p2.x - p1.x);
};

View File

@@ -0,0 +1,3 @@
export const getXFromAngle = (angle: number) => {
return Math.cos(angle);
};

View File

@@ -0,0 +1,3 @@
export const getYFromAngle = (angle: number) => {
return Math.sin(angle);
};

68
src/app/home/globals.ts Normal file
View File

@@ -0,0 +1,68 @@
import { Socket } from 'ngx-socket-io';
import { MapTile } from '../../../../Kawaii-Jumper-server/src/mapTile';
import { makeHTMLAudioElements } from './makeHTMLAudioElements';
import { makeHTMLImageElements } from './makeHTMLImageObjects';
import { scaleScreen } from './scaleScreen';
import { Vector } from './types.dto';
export class Globals {
public width: number = 0;
public height: number = 0;
public canvasScale: number = 0;
public pageWidth: number = 0;
public pageHeight: number = 0;
public canvas: HTMLCanvasElement;
public context: CanvasRenderingContext2D;
public playerImages: HTMLImageElement[] = [];
public platformImages: HTMLImageElement[] = [];
public socket: Socket;
public socketId: string;
public colors: string[] = ['#FF63C8', '#79e7ff'];
public sounds: HTMLAudioElement[] = [];
public playerSize: Vector = { x: 50, y: 34 };
public map: MapTile[] = [];
public backgroudnImage: HTMLImageElement;
private readonly playerImageFiles: string[] = [
'/assets/slime-1-left.png',
'/assets/slime-1-right.png',
'/assets/slime-2-left.png',
'/assets/slime-2-right.png',
];
private readonly platformImageFiles: string[] = [
'/assets/platform-1.png',
'/assets/platform-2.png',
];
private readonly soundFiles: string[] = [
'/assets/jump.wav',
'/assets/land.wav',
];
private static instance: Globals;
private constructor() {
this.setupImages();
this.setupSounds();
}
private setupImages(): void {
this.playerImages = makeHTMLImageElements(this.playerImageFiles);
this.platformImages = makeHTMLImageElements(this.platformImageFiles);
this.backgroudnImage = makeHTMLImageElements(['/assets/bg.png'])[0];
}
private setupSounds(): void {
this.sounds = makeHTMLAudioElements(this.soundFiles);
}
public static getInstance(): Globals {
if (!this.instance) {
this.instance = new Globals();
}
return this.instance;
}
public setupCanvas() {
this.canvas = document.getElementById('game') as HTMLCanvasElement;
this.context = this.canvas.getContext('2d');
scaleScreen();
}
}

View File

@@ -1 +1,4 @@
<canvas id="game"></canvas>
<script>
var socket = io();
</script>

View File

@@ -1,4 +1,28 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { Socket } from 'ngx-socket-io';
import { Position } from '../../../../Kawaii-Jumper-server/src/position';
import {
PlayerDTO,
PlayerDTOList,
PlayerList,
StringNumber,
StringVector,
Vector,
} from './types.dto';
import { MapTile } from '../../../../Kawaii-Jumper-server/src/mapTile';
import { getXFromAngle } from './getXFromAngle';
import { getAngleBetweenTwoPoints } from './getAngleBetweenTwoPoints';
import { getYFromAngle } from './getYFromAngle';
import { applyGravity } from './applyGravity';
import { IsIntersecting } from './isIntersecting';
import { drawMap } from './drawMap';
import { Globals } from './globals';
import { Players } from './players';
import { MySocket } from './mySocket';
import { DeltaTime } from './deltaTime';
@Component({
selector: 'app-home',
@@ -6,50 +30,505 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
styleUrls: ['home.page.scss'],
})
export class HomePage implements OnInit {
globals: Globals;
players: Players;
mySocket: MySocket;
deltaTime: DeltaTime;
canvas: HTMLCanvasElement;
context: CanvasRenderingContext2D;
myLastPosition: Position = { x: 0, y: 0 };
pageHeight = window.innerHeight;
pageWidth = window.innerWidth;
jumpPower = Date.now();
constructor() {
lastPointerPosition: Position = { x: 0, y: 0 };
keysDown: { [key: number]: boolean } = {};
mapBuilder = false;
builtMap: MapTile[] = [];
constructor(private socket: Socket) {
this.globals = Globals.getInstance();
this.players = Players.getInstance();
this.deltaTime = DeltaTime.getInstance();
this.globals.socket = socket;
this.mySocket = MySocket.getInstance();
this.globals.pageHeight = window.innerHeight;
this.globals.pageWidth = window.innerWidth;
this.setupSocketListeners();
}
ngOnInit(): void {
this.canvas = document.getElementById('game') as HTMLCanvasElement;
this.context = this.canvas.getContext('2d');
this.scaleScreen();
this.globals.setupCanvas();
this.setListeners();
this.gameLoop();
}
setupSocketListeners() {
this.mySocket.onId((id: string) => (this.globals.socketId = id));
this.mySocket.onMap((map: MapTile[]) => (this.globals.map = map));
this.mySocket.onPlayerConnected((players: PlayerDTOList) =>
this.players.addMultiplaPlayers(players),
);
this.mySocket.onNewPlayerConnected((player: PlayerDTO) =>
this.players.addPlayer(player),
);
this.mySocket.onPlayerDisconnected((id: string) =>
this.players.removePlayer(id),
);
this.mySocket.onUpdatedPlayerColor((playersColor: StringNumber) =>
this.players.updatePlayerColor(playersColor),
);
this.mySocket.onUpdatedPlayerPosition((playersPosition: StringVector) =>
this.players.updatePlayerPosition(playersPosition),
);
this.mySocket.onUpdatedPlayerDirection((playersDirection: StringNumber) =>
this.players.updatePlayerDirection(playersDirection),
);
}
getJumpPower(): number {
let power = Date.now() - this.jumpPower;
return Math.abs(getXFromAngle(power / 1000) * 1.4);
}
getJumpDirection(x: number, y: number) {
return getAngleBetweenTwoPoints(
{
x:
this.players.getMyself().getPosition().x +
this.globals.playerSize.x / 2,
y:
this.players.getMyself().getPosition().y +
this.globals.playerSize.y / 2,
},
{
x: x * this.globals.canvasScale,
y: y * this.globals.canvasScale,
},
);
}
clickEndListener($event): Position {
console.log('click');
if (!this.players.getMyself()) return;
console.log('I found myself');
if (!this.players.getMyself().isGrounded()) return;
console.log('I am grounded');
this.players.getMyself().swapColor();
this.socket.emit('updatedColor', this.players.getMyself().getColor());
this.players.getMyself().setGrounded(false);
const angle = this.getJumpDirection($event.offsetX, $event.offsetY);
this.players.getMyself().jump(angle, this.getJumpPower());
this.socket.emit(
'updatedDirection',
this.players.getMyself().getDirection(),
);
this.globals.sounds[0].play();
return this.players.getMyself().getMovingVelocity();
}
mapClickListenerEnd($event) {
this.builtMap.push({
color: 0,
x: $event.offsetX * this.globals.canvasScale,
y: $event.offsetY * this.globals.canvasScale,
w: 130,
h: 30,
});
console.log(this.builtMap);
}
moveListener($event): void {
if (!this.globals.socketId) return;
this.lastPointerPosition = {
x: $event.offsetX * this.globals.canvasScale,
y: $event.offsetY * this.globals.canvasScale,
};
}
setListeners() {
window.addEventListener('keydown', (e) => this.keyListener(e, true));
window.addEventListener('keyup', (e) => this.keyListener(e, false));
window.addEventListener('mouseup', (e) => this.mapBuilder ? this.mapClickListenerEnd(e) : this.clickEndListener(e));
window.addEventListener('touchend', (e) => this.clickEndListener(e));
window.addEventListener('mousemove', (e) => this.moveListener(e));
}
keyListener($event, state) {
this.keysDown[$event.keyCode] = state;
}
detectCollisions() {
const player = this.players.getMyself();
for (let block of this.globals.map) {
if (block.color !== this.players.getMyself().getColor()) continue;
const playerWidth = this.globals.playerSize.x;
const playerHeight = this.globals.playerSize.y;
const myPosition = player.getPosition();
const playerTopLeft: Position = myPosition;
const playerTopRight: Position = {
x: myPosition.x + playerWidth,
y: myPosition.y,
};
const playerBottomLeft: Position = {
x: myPosition.x,
y: myPosition.y + playerHeight,
};
const playerBottomRight: Position = {
x: myPosition.x + playerWidth,
y: myPosition.y + playerHeight,
};
const blockTopLeft: Position = { x: block.x, y: block.y };
const blockTopRight: Position = { x: block.x + block.w, y: block.y };
const blockBottomLeft: Position = { x: block.x, y: block.y + block.h };
const blockBottomRight: Position = {
x: block.x + block.w,
y: block.y + block.h,
};
if (
IsIntersecting(
playerTopRight,
playerBottomRight,
blockTopLeft,
blockTopRight,
) &&
IsIntersecting(
playerBottomLeft,
playerBottomRight,
blockTopLeft,
blockBottomLeft,
)
) {
const dx = this.getDistanceX(playerBottomRight, blockTopLeft);
const dy = this.getDistanceY(playerBottomRight, blockTopLeft);
console.log('collision on top left corner of platform');
return dx < dy
? this.players.getMyself().touchRight(blockTopLeft.x)
: this.players.getMyself().touchBottom(blockTopLeft.y);
}
if (
IsIntersecting(
playerTopRight,
playerBottomRight,
blockBottomLeft,
blockBottomRight,
) &&
IsIntersecting(
playerTopLeft,
playerTopRight,
blockTopLeft,
blockBottomLeft,
)
) {
const dx = this.getDistanceX(playerTopRight, blockBottomLeft);
const dy = this.getDistanceY(playerTopRight, blockBottomLeft);
console.log('collision on bottom left corner of platform');
return dx < dy
? this.players.getMyself().touchRight(blockBottomLeft.x)
: this.players.getMyself().touchTop(blockBottomLeft.y);
}
if (
IsIntersecting(
playerTopLeft,
playerBottomLeft,
blockTopLeft,
blockTopRight,
) &&
IsIntersecting(
playerBottomLeft,
playerBottomRight,
blockTopRight,
blockBottomRight,
)
) {
const dx = this.getDistanceX(playerBottomLeft, blockTopRight);
const dy = this.getDistanceY(playerBottomLeft, blockTopRight);
console.log('collision on top right corner of platform');
return dx < dy
? this.players.getMyself().touchLeft(blockTopRight.x)
: this.players.getMyself().touchBottom(blockTopRight.y);
}
if (
IsIntersecting(
playerTopLeft,
playerBottomLeft,
blockBottomLeft,
blockBottomRight,
) &&
IsIntersecting(
playerTopLeft,
playerTopRight,
blockTopRight,
blockBottomRight,
)
) {
const dx = this.getDistanceX(playerTopLeft, blockBottomRight);
const dy = this.getDistanceY(playerTopLeft, blockBottomRight);
console.log('collision on bottom right corner of platform');
return dx < dy
? this.players.getMyself().touchLeft(blockBottomRight.x)
: this.players.getMyself().touchTop(blockBottomRight.y);
}
if (
IsIntersecting(
playerTopLeft,
playerTopRight,
blockTopLeft,
blockBottomLeft,
) &&
IsIntersecting(
playerBottomLeft,
playerBottomRight,
blockTopLeft,
blockBottomLeft,
)
) {
console.log(
'collision on left side of platform (platform bigger than player)',
);
return this.players.getMyself().touchRight(blockBottomLeft.x);
}
if (
IsIntersecting(
playerTopLeft,
playerTopRight,
blockTopRight,
blockBottomRight,
) &&
IsIntersecting(
playerBottomLeft,
playerBottomRight,
blockTopRight,
blockBottomRight,
)
) {
console.log(
'collision on right side of platform (platform bigger than player)',
);
return this.players.getMyself().touchLeft(blockBottomRight.x);
}
if (
IsIntersecting(
playerTopLeft,
playerBottomLeft,
blockBottomLeft,
blockBottomRight,
) &&
IsIntersecting(
playerTopRight,
playerBottomRight,
blockBottomLeft,
blockBottomRight,
)
) {
console.log(
'collision on bottom side of platform (platform bigger than player)',
);
return this.players.getMyself().touchTop(blockBottomLeft.y);
}
if (
IsIntersecting(
playerTopLeft,
playerBottomLeft,
blockTopLeft,
blockTopRight,
) &&
IsIntersecting(
playerTopRight,
playerBottomRight,
blockTopLeft,
blockTopRight,
)
) {
console.log(
'collision on top side of platform (platform bigger than player)',
);
return this.players.getMyself().touchBottom(blockTopLeft.y);
}
if (
IsIntersecting(
playerTopLeft,
playerBottomLeft,
blockTopLeft,
blockTopRight,
)
) {
console.log(
'collision on right side of platform (platform smaller than player)',
);
return this.players.getMyself().touchLeft(blockTopRight.x);
}
if (
IsIntersecting(
playerTopRight,
playerBottomRight,
blockTopLeft,
blockTopRight,
)
) {
console.log(
'collision on left side of platform (platform smaller than player)',
);
return this.players.getMyself().touchRight(blockTopLeft.x);
}
if (
IsIntersecting(
playerTopLeft,
playerTopRight,
blockTopLeft,
blockBottomLeft,
)
) {
console.log(
'collision on bottom side of platform (platform smaller than player)',
);
return this.players.getMyself().touchTop(blockBottomLeft.y);
}
if (
IsIntersecting(
playerBottomLeft,
playerBottomRight,
blockTopLeft,
blockBottomLeft,
)
) {
console.log(
'collision on top side of platform (platform smaller than player)',
);
return this.players.getMyself().touchBottom(blockTopLeft.y);
}
}
/* MAP BOUNDS */
if (
this.players.getMyself().getPosition().y >
this.globals.height - this.globals.playerSize.y
) {
this.players.getMyself().touchBottom(this.globals.height);
}
if (this.players.getMyself().getPosition().x < 0) {
this.players.getMyself().touchLeft(0);
}
if (
this.players.getMyself().getPosition().x >
this.globals.width - this.globals.playerSize.x
) {
this.players.getMyself().touchRight(this.globals.width);
}
}
updatePlayerPosition() {
if (!this.players.getMyself()) return;
this.detectCollisions();
if (
this.players.getMyself().getPosition().x !== this.myLastPosition.x ||
this.players.getMyself().getPosition().y !== this.myLastPosition.y
) {
this.socket.emit(
'updatedPosition',
this.players.getMyself().getPosition(),
);
this.myLastPosition = { ...this.players.getMyself().getPosition() };
}
}
getDistanceX(p1: Position, p2: Position): number {
return Math.abs(p1.x - p2.x);
}
getDistanceY(p1: Position, p2: Position): number {
return Math.abs(p1.y - p2.y);
}
drawPointer() {
if (!this.globals.socketId) return;
this.globals.context.strokeStyle = '#00ff0066';
this.globals.context.lineWidth = 5;
const angle = getAngleBetweenTwoPoints(
{
x:
this.players.getMyself().getPosition().x +
this.globals.playerSize.x / 2,
y:
this.players.getMyself().getPosition().y +
this.globals.playerSize.y / 2,
},
this.lastPointerPosition,
);
this.globals.context.beginPath();
this.globals.context.moveTo(
this.players.getMyself().getPosition().x + this.globals.playerSize.x / 2,
this.players.getMyself().getPosition().y + this.globals.playerSize.y / 2,
);
this.globals.context.lineTo(
this.players.getMyself().getPosition().x +
this.globals.playerSize.x / 2 +
getXFromAngle(angle) * this.getJumpPower() * 50,
this.players.getMyself().getPosition().y +
this.globals.playerSize.y / 2 +
getYFromAngle(angle) * this.getJumpPower() * 50,
);
this.globals.context.stroke();
}
gameLoop() {
this.globals.context.fillStyle = 'gray';
this.globals.context.drawImage(
this.globals.backgroudnImage,
0,
0,
this.globals.width,
this.globals.height,
);
this.drawPlayer();
requestAnimationFrame(() => {this.gameLoop();});
drawMap(
this.globals.map,
this.globals.context,
this.globals.platformImages,
);
if (this.mapBuilder) {
drawMap(
this.builtMap,
this.globals.context,
this.globals.platformImages,
);
}
drawPlayer() {
this.context.fillStyle = 'white';
this.context.fillRect(50, 50, 50, 50);
}
this.deltaTime.updateDeltaTime();
this.players.tick();
this.players.draw();
setCanvasSize(w: number, h: number) {
this.canvas.style.height = h + 'px';
this.canvas.style.width = w + 'px';
this.canvas.height = h;
this.canvas.width = w;
}
this.updatePlayerPosition();
this.drawPointer();
scaleScreen() {
const scaleX = this.pageWidth / 9;
const scaleY = this.pageHeight / 16;
if (scaleX > scaleY) { // width is longer, calculate based on height
return this.setCanvasSize(this.pageHeight / 16 * 9, this.pageHeight);
requestAnimationFrame(() => {
this.gameLoop();
});
}
this.setCanvasSize(this.pageWidth, this.pageWidth / 9 * 16) // height is longer, calculate based on width
}
}

View File

@@ -0,0 +1,25 @@
import { Vector } from './types.dto';
export const IsIntersecting = (
l1p1: Vector, // line 1 point 1
l1p2: Vector, // line 1 point 2
l2p1: Vector, // line 2 point 1
l2p2: Vector, // line 2 point 2
): boolean => {
const denominator =
(l1p2.x - l1p1.x) * (l2p2.y - l2p1.y) -
(l1p2.y - l1p1.y) * (l2p2.x - l2p1.x);
const numerator1 =
(l1p1.y - l2p1.y) * (l2p2.x - l2p1.x) -
(l1p1.x - l2p1.x) * (l2p2.y - l2p1.y);
const numerator2 =
(l1p1.y - l2p1.y) * (l1p2.x - l1p1.x) -
(l1p1.x - l2p1.x) * (l1p2.y - l1p1.y);
if (denominator == 0) return numerator1 == 0 && numerator2 == 0;
const r = numerator1 / denominator;
const s = numerator2 / denominator;
return r >= 0 && r <= 1 && s >= 0 && s <= 1;
};

View File

@@ -0,0 +1,11 @@
export const makeHTMLAudioElements = (
fileList: string[],
): HTMLAudioElement[] => {
const sounds: HTMLAudioElement[] = [];
for (let file of fileList) {
sounds.push(new Audio(file));
}
return sounds;
};

View File

@@ -0,0 +1,13 @@
export const makeHTMLImageElements = (
fileList: string[],
): HTMLImageElement[] => {
const images: HTMLImageElement[] = [];
for (let file of fileList) {
const image = new Image();
image.src = file;
images.push(image);
}
return images;
};

49
src/app/home/mySocket.ts Normal file
View File

@@ -0,0 +1,49 @@
import { Globals } from './globals';
export class MySocket {
private static instance: MySocket;
private globals: Globals;
private constructor() {
this.globals = Globals.getInstance();
}
public static getInstance(): MySocket {
if (!this.instance) {
this.instance = new MySocket();
}
return this.instance;
}
public onId(callback: CallableFunction): void {
this.globals.socket.on('takeYourIdAndLeaveMeAlone', callback);
}
public onPlayerConnected(callback: CallableFunction): void {
this.globals.socket.on('connectedPlayers', callback);
}
public onNewPlayerConnected(callback: CallableFunction): void {
this.globals.socket.on('newPlayer', callback);
}
public onPlayerDisconnected(callback: CallableFunction): void {
this.globals.socket.on('playerDisconnected', callback);
}
public onUpdatedPlayerPosition(callback: CallableFunction): void {
this.globals.socket.on('updatedPlayerPositions', callback);
}
public onUpdatedPlayerColor(callback: CallableFunction): void {
this.globals.socket.on('updatedPlayerColor', callback);
}
public onUpdatedPlayerDirection(callback: CallableFunction): void {
this.globals.socket.on('updatedPlayerDirection', callback);
}
public onMap(callback: CallableFunction): void {
this.globals.socket.on('takeTheMapAndBeQuiet', callback);
}
}

146
src/app/home/player.ts Normal file
View File

@@ -0,0 +1,146 @@
import { Position } from '../../../../Kawaii-Jumper-server/src/position';
import { applyGravity } from './applyGravity';
import { DeltaTime } from './deltaTime';
import { getXFromAngle } from './getXFromAngle';
import { getYFromAngle } from './getYFromAngle';
import { Globals } from './globals';
import { PlayerDTO, Vector } from './types.dto';
export class Player {
private readonly globals: Globals;
private readonly deltaTime: DeltaTime;
private id: string;
private position: Vector;
private name: string;
private movingVelocity: Vector;
private color: number;
private direction: number;
private grounded: boolean;
public constructor(id: string, data: PlayerDTO) {
this.globals = Globals.getInstance();
this.deltaTime = DeltaTime.getInstance();
this.id = id;
this.position = data.position;
this.name = data.name;
this.movingVelocity = data.movingVelocity;
this.color = data.color;
this.direction = data.direction;
this.grounded = true;
}
public applyGravity() {
this.movingVelocity = {
...applyGravity(this.movingVelocity, this.deltaTime.getDeltaTime()),
};
}
public resetVelocity() {
this.movingVelocity = { x: 0, y: 0 };
}
public updatePosition(position: Vector): void {
this.position = { ...position };
}
public updateDirection(direction: number): void {
this.direction = direction;
}
public updateColor(color: number): void {
this.color = color;
}
public getId(): string {
return this.id;
}
public getPosition(): Vector {
return { ...this.position };
}
public getName(): string {
return this.name;
}
public getColor(): number {
return this.color;
}
public getDirection(): number {
return this.direction;
}
public isGrounded(): boolean {
return this.grounded;
}
public setGrounded(grounded: boolean): void {
this.grounded = grounded;
}
public getMovingVelocity(): Vector {
return { ...this.movingVelocity };
}
public swapColor(): void {
this.color = this.color === 0 ? 1 : 0;
}
public jump(angle: number, jumpPower: number): void {
this.movingVelocity.x = getXFromAngle(angle) * jumpPower;
this.movingVelocity.y = getYFromAngle(angle) * jumpPower;
this.direction = this.movingVelocity.x > 0 ? 1 : 0;
}
public move(): void {
this.position.x += this.movingVelocity.x * this.deltaTime.getDeltaTime();
this.position.y += this.movingVelocity.y * this.deltaTime.getDeltaTime();
}
public touchBottom(resetPoint: number) {
this.position.y = resetPoint - this.globals.playerSize.y - 1;
this.grounded = true;
if (this.id === this.globals.socketId) {
this.globals.sounds[1].play();
}
this.resetVelocity();
}
public touchTop(resetPoint: number) {
this.position.y = resetPoint + 1;
this.resetVelocity();
}
public touchLeft(resetPoint: number) {
this.position.x = resetPoint + 1;
this.resetVelocity();
}
public touchRight(resetPoint: number) {
this.position.x = resetPoint - this.globals.playerSize.x - 1;
this.resetVelocity();
}
public isMyself(): boolean {
return this.id === this.globals.socketId;
}
public draw() {
this.globals.context.drawImage(
this.globals.playerImages[this.color * 2 + this.direction],
this.position.x,
this.position.y,
this.globals.playerSize.x,
this.globals.playerSize.y,
);
this.globals.context.fillStyle = 'black';
this.globals.context.textAlign = 'center';
this.globals.context.font = '25px Arial';
this.globals.context.fillText(
this.name,
this.position.x + this.globals.playerSize.x / 2,
this.position.y - 30,
);
}
}

98
src/app/home/players.ts Normal file
View File

@@ -0,0 +1,98 @@
import { applyGravity } from './applyGravity';
import { Globals } from './globals';
import { Player } from './player';
import {
PlayerDTO,
PlayerDTOList,
PlayerList,
StringNumber,
StringVector,
Vector,
} from './types.dto';
export class Players {
private globals: Globals;
private players: PlayerList = {};
private static instance: Players;
private constructor() {
this.globals = Globals.getInstance();
}
public static getInstance(): Players {
if (!this.instance) {
this.instance = new Players();
}
return this.instance;
}
public tick(): void {
for (let id of this.getPlayerIds()) {
if (this.getPlayer(id).isGrounded()) {
continue;
}
this.getPlayer(id).applyGravity();
this.getPlayer(id).move();
}
}
public resetVelocity(id: string): void {
this.getPlayer(id).resetVelocity();
}
public resetMyVelocity(): void {
this.resetVelocity(this.globals.socketId);
}
public getPlayerIds(): string[] {
return Object.keys(this.players);
}
public getPlayer(id: string): Player {
return this.players[id];
}
public addMultiplaPlayers(players: PlayerDTOList): void {
for (let player of Object.keys(players)) {
this.addPlayer(players[player]);
}
}
public addPlayer(player: PlayerDTO): Players {
this.players[player.id] = new Player(player.id, player);
return this;
}
public removePlayer(id: string): Players {
delete this.players[id];
return this;
}
public updatePlayerPosition(playersPosition: StringVector): void {
for (let id of Object.keys(playersPosition)) {
this.getPlayer(id).updatePosition(playersPosition[id]);
}
}
public updatePlayerDirection(playersDirection: StringNumber): void {
for (let id of Object.keys(playersDirection)) {
this.getPlayer(id).updateDirection(playersDirection[id]);
}
}
public updatePlayerColor(playersColor: { [key: string]: number }): void {
for (let id of Object.keys(playersColor)) {
this.getPlayer(id).updateColor(playersColor[id]);
}
}
public getMyself(): Player {
return this.getPlayer(Globals.getInstance().socketId);
}
public draw(): void {
for (let id of this.getPlayerIds()) {
this.players[id].draw();
}
}
}

View File

@@ -0,0 +1,11 @@
import { Globals } from "./globals";
import { setCanvasSize } from "./setCanvasSize";
export const scaleScreen = () => {
const scaleX = Globals.getInstance().pageWidth / 9;
const scaleY = Globals.getInstance().pageHeight / 16;
if (scaleX > scaleY) { // width is longer, calculate based on height
return setCanvasSize((Globals.getInstance().pageHeight / 16) * 9, Globals.getInstance().pageHeight);
}
setCanvasSize(Globals.getInstance().pageWidth, (Globals.getInstance().pageWidth / 9) * 16); // height is longer, calculate based on width
}

View File

@@ -0,0 +1,11 @@
import { Globals } from "./globals";
export const setCanvasSize = (w: number, h: number) => {
Globals.getInstance().canvasScale = 1920 / h;
Globals.getInstance().width = w * Globals.getInstance().canvasScale;
Globals.getInstance().height = h * Globals.getInstance().canvasScale;
Globals.getInstance().canvas.style.height = h + 'px';
Globals.getInstance().canvas.style.width = w + 'px';
Globals.getInstance().canvas.height = Globals.getInstance().height;
Globals.getInstance().canvas.width = Globals.getInstance().width;
}

21
src/app/home/types.dto.ts Normal file
View File

@@ -0,0 +1,21 @@
import { Position } from '../../../../Kawaii-Jumper-server/src/position';
import { Player } from './player';
export type PlayerDTO = {
id: string;
position: Position;
name: string;
movingVelocity: Position;
color: number;
direction: number;
};
export type PlayerList = { [key: string]: Player };
export type PlayerDTOList = { [key: string]: PlayerDTO };
export type Vector = { x: number; y: number };
export type StringString = { [key: string]: string };
export type StringNumber = { [key: string]: number };
export type StringVector = { [key: string]: Vector };
export type StringBoolean = { [key: string]: boolean };

BIN
src/assets/bg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
src/assets/jump.wav Normal file

Binary file not shown.

BIN
src/assets/land.wav Normal file

Binary file not shown.

BIN
src/assets/platform-1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/platform-2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/slime-1-left.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
src/assets/slime-2-left.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

View File

@@ -11,6 +11,9 @@
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<link rel="icon" type="image/png" href="assets/icon/favicon.png" />