Skip to content

Upgrade three to 148 version #10

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
Seafnox wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Upgrade three to 148 version #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6201f16
update three to version 136
Seafnox Jan 15, 2023
497015c
create importmap for compatibility and upgrade three to 139
Seafnox Jan 15, 2023
31f5574
upgrade three to 144
Seafnox Jan 15, 2023
c2a5d4b
upgrade three to 148 - last available
Seafnox Jan 15, 2023
6e66039
remove trash code
Seafnox Jan 15, 2023
d6f7146
add simple editor config
Seafnox Jan 15, 2023
d4616c8
turn indent to 2 space
Seafnox Jan 15, 2023
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
11 changes: 11 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 160
tab_width = 2
trim_trailing_whitespace = true
277 changes: 143 additions & 134 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,143 @@
<!DOCTYPE html>
<html>
<head>
<title>The Legend of SimonDev</title>
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="base.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=IM+Fell+English&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=IM+Fell+French+Canon+SC&display=swap" rel="stylesheet">
</head>
<body>
<script src="./src/main.js" type="module">
</script>
<div class="container" id="container">
<div class="ui">
<div class="quest-journal-layout">
<div class="quest-journal" id="quest-journal">
</div>
</div>
</div>
<div class="ui">
<div class="quest-ui-layout">
<div class="quest-ui" id="quest-ui">
<div class="quest-text-title" id="quest-text-title"></div>
<div class="quest-text" id="quest-text"></div>
</div>
</div>
</div>
<div class="ui">
<div class="icon-ui">
<div class="icon-bar" id="icon-bar">
<div class="icon-bar-item" id="icon-bar-stats" style="background-image: url('./resources/icons/ui/skills.png');"></div>
<div class="icon-bar-item" id="icon-bar-inventory" style="background-image: url('./resources/icons/ui/backpack.png');"></div>
<div class="icon-bar-item" id="icon-bar-quests" style="background-image: url('./resources/icons/ui/tied-scroll.png');"></div>
</div>
</div>
</div>
<div class="ui">
<div class="stats" id="stats">
<div class="stats-inner">
<div class="stats-title">Statistics</div>
<div class="stats-row">
<div class="stats-tooltip">Strength
<div class="stats-tooltiptext">How strong you are, affects how much damage you do. So blah blah if you're doing stuff then its stronger or whatever, the damage is up. This is text to show the tooltip.</div>
</div>
<div id="stats-strength">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Wisdomness
<div class="stats-tooltiptext">Wisdom is the guage of something to do with wisdom in the game because wisdom is important and wisdom is wise to wisdoming.</div>
</div>
<div id="stats-wisdomness">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Benchpress
<div class="stats-tooltiptext">Gotta have a good bench to be a warrior or something.</div>
</div>
<div id="stats-benchpress">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Curl
<div class="stats-tooltiptext">The ultimate expression of strength, this affects literally everything in your life.</div>
</div>
<div id="stats-curl">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">XP
<div class="stats-tooltiptext">How much xp you've accumulated by killing things for xp. Get enough and you'll gain a level or something.</div>
</div>
<div id="stats-experience">0</div>
</div>
</div>
</div>
</div>
<div class="ui">
<div class="health-ui">
<div class="health-bar" id="health-bar"></div>
</div>
</div>
<div class="ui">
<div class="inventory" id="inventory">
<div class="inventory-inner">
<div class="inventory-title">Inventory</div>
<div class="inventory-row">
<div class="inventory-column">
<div class="inventory-item" id="inventory-equip-1" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-2" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-3" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-4" draggable="true"></div>
</div>
<div class="inventory-character"></div>
<div class="inventory-column">
<div class="inventory-item" id="inventory-equip-5" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-6" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-7" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-8" draggable="true"></div>
</div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-1" draggable="true"></div>
<div class="inventory-item" id="inventory-2" draggable="true"></div>
<div class="inventory-item" id="inventory-3" draggable="true"></div>
<div class="inventory-item" id="inventory-4" draggable="true"></div>
<div class="inventory-item" id="inventory-5" draggable="true"></div>
<div class="inventory-item" id="inventory-6" draggable="true"></div>
<div class="inventory-item" id="inventory-7" draggable="true"></div>
<div class="inventory-item" id="inventory-8" draggable="true"></div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-9" draggable="true"></div>
<div class="inventory-item" id="inventory-10" draggable="true"></div>
<div class="inventory-item" id="inventory-11" draggable="true"></div>
<div class="inventory-item" id="inventory-12" draggable="true"></div>
<div class="inventory-item" id="inventory-13" draggable="true"></div>
<div class="inventory-item" id="inventory-14" draggable="true"></div>
<div class="inventory-item" id="inventory-15" draggable="true"></div>
<div class="inventory-item" id="inventory-16" draggable="true"></div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-17" draggable="true"></div>
<div class="inventory-item" id="inventory-18" draggable="true"></div>
<div class="inventory-item" id="inventory-19" draggable="true"></div>
<div class="inventory-item" id="inventory-20" draggable="true"></div>
<div class="inventory-item" id="inventory-21" draggable="true"></div>
<div class="inventory-item" id="inventory-22" draggable="true"></div>
<div class="inventory-item" id="inventory-23" draggable="true"></div>
<div class="inventory-item" id="inventory-24" draggable="true"></div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<title>The Legend of SimonDev</title>
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="base.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=IM+Fell+English&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=IM+Fell+French+Canon+SC&display=swap" rel="stylesheet">
</head>
<body>
<script type="importmap">
{
"imports": {
"three": "https://cdn.jsdelivr.net/npm/three@0.148.0/build/three.module.js",
"three/GLTFLoader": "https://cdn.jsdelivr.net/npm/three@0.148.0/examples/jsm/loaders/GLTFLoader.js",
"three/FBXLoader": "https://cdn.jsdelivr.net/npm/three@0.148.0/examples/jsm/loaders/FBXLoader.js"
}
}
</script>
<script src="./src/main.js" type="module">
</script>
<div class="container" id="container">
<div class="ui">
<div class="quest-journal-layout">
<div class="quest-journal" id="quest-journal">
</div>
</div>
</div>
<div class="ui">
<div class="quest-ui-layout">
<div class="quest-ui" id="quest-ui">
<div class="quest-text-title" id="quest-text-title"></div>
<div class="quest-text" id="quest-text"></div>
</div>
</div>
</div>
<div class="ui">
<div class="icon-ui">
<div class="icon-bar" id="icon-bar">
<div class="icon-bar-item" id="icon-bar-stats" style="background-image: url('./resources/icons/ui/skills.png');"></div>
<div class="icon-bar-item" id="icon-bar-inventory" style="background-image: url('./resources/icons/ui/backpack.png');"></div>
<div class="icon-bar-item" id="icon-bar-quests" style="background-image: url('./resources/icons/ui/tied-scroll.png');"></div>
</div>
</div>
</div>
<div class="ui">
<div class="stats" id="stats">
<div class="stats-inner">
<div class="stats-title">Statistics</div>
<div class="stats-row">
<div class="stats-tooltip">Strength
<div class="stats-tooltiptext">How strong you are, affects how much damage you do. So blah blah if you're doing stuff then its stronger or whatever, the damage is up. This is text to show the tooltip.</div>
</div>
<div id="stats-strength">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Wisdomness
<div class="stats-tooltiptext">Wisdom is the guage of something to do with wisdom in the game because wisdom is important and wisdom is wise to wisdoming.</div>
</div>
<div id="stats-wisdomness">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Benchpress
<div class="stats-tooltiptext">Gotta have a good bench to be a warrior or something.</div>
</div>
<div id="stats-benchpress">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">Curl
<div class="stats-tooltiptext">The ultimate expression of strength, this affects literally everything in your life.</div>
</div>
<div id="stats-curl">0</div>
</div>
<div class="stats-row">
<div class="stats-tooltip">XP
<div class="stats-tooltiptext">How much xp you've accumulated by killing things for xp. Get enough and you'll gain a level or something.</div>
</div>
<div id="stats-experience">0</div>
</div>
</div>
</div>
</div>
<div class="ui">
<div class="health-ui">
<div class="health-bar" id="health-bar"></div>
</div>
</div>
<div class="ui">
<div class="inventory" id="inventory">
<div class="inventory-inner">
<div class="inventory-title">Inventory</div>
<div class="inventory-row">
<div class="inventory-column">
<div class="inventory-item" id="inventory-equip-1" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-2" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-3" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-4" draggable="true"></div>
</div>
<div class="inventory-character"></div>
<div class="inventory-column">
<div class="inventory-item" id="inventory-equip-5" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-6" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-7" draggable="true"></div>
<div class="inventory-item" id="inventory-equip-8" draggable="true"></div>
</div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-1" draggable="true"></div>
<div class="inventory-item" id="inventory-2" draggable="true"></div>
<div class="inventory-item" id="inventory-3" draggable="true"></div>
<div class="inventory-item" id="inventory-4" draggable="true"></div>
<div class="inventory-item" id="inventory-5" draggable="true"></div>
<div class="inventory-item" id="inventory-6" draggable="true"></div>
<div class="inventory-item" id="inventory-7" draggable="true"></div>
<div class="inventory-item" id="inventory-8" draggable="true"></div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-9" draggable="true"></div>
<div class="inventory-item" id="inventory-10" draggable="true"></div>
<div class="inventory-item" id="inventory-11" draggable="true"></div>
<div class="inventory-item" id="inventory-12" draggable="true"></div>
<div class="inventory-item" id="inventory-13" draggable="true"></div>
<div class="inventory-item" id="inventory-14" draggable="true"></div>
<div class="inventory-item" id="inventory-15" draggable="true"></div>
<div class="inventory-item" id="inventory-16" draggable="true"></div>
</div>
<div class="inventory-row">
<div class="inventory-item" id="inventory-17" draggable="true"></div>
<div class="inventory-item" id="inventory-18" draggable="true"></div>
<div class="inventory-item" id="inventory-19" draggable="true"></div>
<div class="inventory-item" id="inventory-20" draggable="true"></div>
<div class="inventory-item" id="inventory-21" draggable="true"></div>
<div class="inventory-item" id="inventory-22" draggable="true"></div>
<div class="inventory-item" id="inventory-23" draggable="true"></div>
<div class="inventory-item" id="inventory-24" draggable="true"></div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
8 changes: 4 additions & 4 deletions src/attacker-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as THREE from 'https://cdn.jsdelivr.net/npm/three@0.118/build/three.module.js';
import * as THREE from 'three';

import {entity} from './entity.js';

Expand Down Expand Up @@ -46,7 +46,7 @@ export const attack_controller = (() => {
if (c.entity == this._parent) {
return false;
}

const h = c.entity.GetComponent('HealthComponent');
if (!h) {
return false;
Expand All @@ -65,7 +65,7 @@ export const attack_controller = (() => {
const forward = new THREE.Vector3(0, 0, 1);
forward.applyQuaternion(this._parent._rotation);
forward.normalize();

let damage = this.GetComponent('HealthComponent')._params.strength;
if (item) {
damage *= item.Params.damage;
Expand All @@ -88,4 +88,4 @@ export const attack_controller = (() => {
return {
AttackController: AttackController,
};
})();
})();
4 changes: 2 additions & 2 deletions src/entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as THREE from 'https://cdn.jsdelivr.net/npm/three@0.118/build/three.module.js';
import * as THREE from 'three';


export const entity = (() => {
Expand Down Expand Up @@ -120,4 +120,4 @@ export const entity = (() => {
Component: Component,
};

})();
})();
4 changes: 2 additions & 2 deletions src/equip-weapon-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {entity} from './entity.js';

import {FBXLoader} from 'https://cdn.jsdelivr.net/npm/three@0.118.1/examples/jsm/loaders/FBXLoader.js';
import {FBXLoader} from 'three/FBXLoader';


export const equip_weapon_component = (() => {
Expand Down Expand Up @@ -87,4 +87,4 @@ export const equip_weapon_component = (() => {
return {
EquipWeapon: EquipWeapon,
};
})();
})();
Loading