Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 07:18:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved entity section guessing when translating entities.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-08-14 18:29:40 +02:00
parent 791968dd4e
commit 3a94a94e5d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quest_editor/loading/entities.ts
View File

@ -80,7 +80,7 @@ export async function load_npc_geometry(npc_type: NpcType): Promise<BufferGeomet
}); });
} }
export async function load_npc_tex(npc_type: NpcType): Promise<Texture[]> { export async function load_npc_textures(npc_type: NpcType): Promise<Texture[]> {
return npc_tex_cache.get_or_set(npc_type, async () => { return npc_tex_cache.get_or_set(npc_type, async () => {
try { try {
const { data } = await load_npc_data(npc_type, AssetType.Texture); const { data } = await load_npc_data(npc_type, AssetType.Texture);
@ -114,7 +114,7 @@ export async function load_object_geometry(object_type: ObjectType): Promise<Buf
}); });
} }
export async function load_object_tex(object_type: ObjectType): Promise<Texture[]> { export async function load_object_textures(object_type: ObjectType): Promise<Texture[]> {
return object_tex_cache.get_or_set(object_type, async () => { return object_tex_cache.get_or_set(object_type, async () => {
try { try {
const { data } = await load_object_data(object_type, AssetType.Texture); const { data } = await load_object_data(object_type, AssetType.Texture);

8
src/quest_editor/rendering/QuestModelManager.ts
View File

@ -4,9 +4,9 @@ import { Intersection, Mesh, Object3D, Raycaster, Vector3 } from "three";
import { load_area_collision_geometry, load_area_render_geometry } from "../loading/areas"; import { load_area_collision_geometry, load_area_render_geometry } from "../loading/areas";
import { import {
load_npc_geometry, load_npc_geometry,
load_npc_tex as load_npc_textures, load_npc_textures,
load_object_geometry, load_object_geometry,
load_object_tex as load_object_textures, load_object_textures,
} from "../loading/entities"; } from "../loading/entities";
import { create_npc_mesh, create_object_mesh } from "./conversion/entities"; import { create_npc_mesh, create_object_mesh } from "./conversion/entities";
import { QuestRenderer } from "./QuestRenderer"; import { QuestRenderer } from "./QuestRenderer";
@ -129,12 +129,12 @@ export class QuestModelManager {
raycaster.set(origin, down); raycaster.set(origin, down);
const intersection1 = raycaster const intersection1 = raycaster
.intersectObject(render_geom, true) .intersectObject(render_geom, true)
.find(i => (i.object.userData as AreaUserData).section != null); .find(i => (i.object.userData as AreaUserData).section != undefined);
raycaster.set(origin, up); raycaster.set(origin, up);
const intersection2 = raycaster const intersection2 = raycaster
.intersectObject(render_geom, true) .intersectObject(render_geom, true)
.find(i => (i.object.userData as AreaUserData).section != null); .find(i => (i.object.userData as AreaUserData).section != undefined);
let intersection: Intersection | undefined; let intersection: Intersection | undefined;

1
src/quest_editor/rendering/conversion/areas.ts
View File

@ -141,6 +141,7 @@ export function area_geometry_to_sections_and_object_3d(
mesh.position.set(section.position.x, section.position.y, section.position.z); mesh.position.set(section.position.x, section.position.y, section.position.z);
mesh.rotation.set(section.rotation.x, section.rotation.y, section.rotation.z); mesh.rotation.set(section.rotation.x, section.rotation.y, section.rotation.z);
mesh.updateMatrixWorld();
if (section.id >= 0) { if (section.id >= 0) {
const sec = new Section(section.id, section.position, section.rotation.y); const sec = new Section(section.id, section.position, section.rotation.y);