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

Fixed all formatting and linting errors introduced by upgraded eslint and prettier.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2020-04-25 20:29:20 +02:00
parent 344788be55
commit 599cab4b2b
22 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.prettierrc.json
View File

@ -1,6 +1,8 @@
{
"endOfLine": "auto",
"printWidth": 100,
"tabWidth": 4,
"singleQuote": false,
"trailingComma": "all"
}
"trailingComma": "all",
"arrowParens": "avoid"
}

14
src/core/data_formats/compression/prs/compress.ts
View File

@ -81,10 +81,7 @@ class Context {
this.flags >>>= this.flag_bits_left;
const pos = this.output.position;
this.output
.seek_start(this.flag_offset)
.write_u8(this.flags)
.seek_start(pos);
this.output.seek_start(this.flag_offset).write_u8(this.flags).seek_start(pos);
this.write_u8(0);
this.write_u8(0);
@ -95,11 +92,10 @@ class Context {
if (this.flag_bits_left-- === 0) {
// Write out the flags to their position in the file, and store the next flags byte position.
const pos = this.output.position;
this.output
.seek_start(this.flag_offset)
.write_u8(this.flags)
.seek_start(pos)
.write_u8(0); // Placeholder for the next flags byte.
this.output.seek_start(this.flag_offset);
this.output.write_u8(this.flags);
this.output.seek_start(pos);
this.output.write_u8(0); // Placeholder for the next flags byte.
this.flag_offset = pos;
this.flag_bits_left = 7;
}

16
src/core/data_formats/compression/prs/compress_high.ts
View File

@ -126,11 +126,10 @@ class Context {
if (!this.flag_bits_left--) {
// Write out the flags to their position in the file, and store the next flags byte position.
const pos = this.dst.position;
this.dst
.seek_start(this.flag_offset)
.write_u8(this.flags)
.seek_start(pos)
.write_u8(0); // Placeholder for the next flags byte.
this.dst.seek_start(this.flag_offset);
this.dst.write_u8(this.flags);
this.dst.seek_start(pos);
this.dst.write_u8(0); // Placeholder for the next flags byte.
this.flag_offset = pos;
this.flag_bits_left = 7;
}
@ -153,10 +152,9 @@ class Context {
write_final_flags(): void {
this.flags >>>= this.flag_bits_left;
const pos = this.dst.position;
this.dst
.seek_start(this.flag_offset)
.write_u8(this.flags)
.seek_start(pos);
this.dst.seek_start(this.flag_offset);
this.dst.write_u8(this.flags);
this.dst.seek_start(pos);
}
write_eof(): void {

6
src/core/data_formats/cursor/ResizableBufferCursor.test.ts
View File

@ -34,11 +34,7 @@ test_integer_write("write_i32");
test("write, seek backwards then take", () => {
const cursor = new ResizableBufferCursor(new ResizableBuffer(0), Endianness.Little);
cursor
.write_u32(1)
.write_u32(2)
.write_u32(3)
.write_u32(4);
cursor.write_u32(1).write_u32(2).write_u32(3).write_u32(4);
cursor.seek(-8);
const new_cursor = cursor.take(8);

12
src/core/data_formats/cursor/WritableCursor.test.ts
View File

@ -57,11 +57,7 @@ test_all(
(cursor, endianness) => {
expect(cursor.position).toBe(0);
cursor
.write_u8(99)
.write_u8(99)
.write_u8(99)
.write_u8(99);
cursor.write_u8(99).write_u8(99).write_u8(99).write_u8(99);
cursor.seek(-1);
expect(cursor.size).toBe(cursor.position + cursor.bytes_left);
@ -176,11 +172,7 @@ test_all(
"write, seek backwards then take",
() => new Array<number>(16).fill(0),
cursor => {
cursor
.write_u32(1)
.write_u32(2)
.write_u32(3)
.write_u32(4);
cursor.write_u32(1).write_u32(2).write_u32(3).write_u32(4);
cursor.seek(-8);
const new_cursor = cursor.take(8);

10
src/core/data_formats/parsing/quest/dat.ts
View File

@ -113,8 +113,9 @@ export function parse_dat(cursor: Cursor): DatFile {
} else {
if (entities_size !== total_size - 16) {
throw Error(
`Malformed DAT file. Expected an entities size of ${total_size -
16}, got ${entities_size}.`,
`Malformed DAT file. Expected an entities size of ${
total_size - 16
}, got ${entities_size}.`,
);
}
@ -301,8 +302,9 @@ function parse_events(cursor: Cursor, area_id: number, events: DatEvent[]): void
if (cursor.position !== actions_offset) {
logger.warn(
`Read ${cursor.position - 16} bytes of event data instead of expected ${actions_offset -
16}.`,
`Read ${cursor.position - 16} bytes of event data instead of expected ${
actions_offset - 16
}.`,
);
}

5
src/core/data_formats/parsing/quest/qst.ts
View File

@ -367,8 +367,9 @@ function parse_files(
if (cursor.position !== start_position + chunk_size) {
throw new Error(
`Read ${cursor.position -
start_position} file chunk message bytes instead of expected ${chunk_size}.`,
`Read ${
cursor.position - start_position
} file chunk message bytes instead of expected ${chunk_size}.`,
);
}
}

7
src/core/observable/property/list/ListProperty.test.ts
View File

@ -1,9 +1,4 @@
import {
is_list_property,
ListChangeType,
ListProperty,
ListChangeEvent,
} from "./ListProperty";
import { is_list_property, ListChangeType, ListProperty, ListChangeEvent } from "./ListProperty";
import { SimpleListProperty } from "./SimpleListProperty";
import { MappedListProperty } from "./MappedListProperty";
import { list_property } from "../../index";

3
src/core/rendering/conversion/ninja_geometry.ts
View File

@ -10,12 +10,10 @@ import {
Mat4,
mat4_multiply,
mat4_vec3_multiply_into,
Vec2,
Vec3,
} from "../../math/linear_algebra";
const DEFAULT_NORMAL = new Vec3(0, 1, 0);
const DEFAULT_UV = new Vec2(0, 0);
const NO_TRANSLATION = new Vec3(0, 0, 0);
const NO_ROTATION = new Quat(1, 0, 0, 0);
const NO_SCALE = new Vec3(1, 1, 1);
@ -71,7 +69,6 @@ class MeshCreator {
hidden,
break_child_trace,
zxy_rotation_order,
skip,
} = object.evaluation_flags;
const { position, rotation, scale } = object;

10
src/core/rendering/conversion/ninja_three_geometry.ts
View File

@ -257,12 +257,10 @@ class GeometryCreator {
const nb = this.builder.get_normal(b);
const nc = this.builder.get_normal(c);
// Calculate a surface normal and reverse the vertex winding if at least 2 of the vertex normals point in the opposite direction.
// This hack fixes the winding for most models.
const normal = pb
.clone()
.sub(pa)
.cross(pc.clone().sub(pa));
// Calculate a surface normal and reverse the vertex winding if at least 2 of the
// vertex normals point in the opposite direction. This hack fixes the winding for
// most models.
const normal = pb.clone().sub(pa).cross(pc.clone().sub(pa));
if (clockwise) {
normal.negate();

12
src/core/rendering/webgpu/WebgpuGfx.ts
View File

@ -28,7 +28,7 @@ export class WebgpuGfx implements Gfx<WebgpuMesh, GPUTexture> {
const bind_group = this.device.createBindGroup({
layout: this.bind_group_layout,
bindings: [
entries: [
{
binding: 0,
resource: {
@ -111,8 +111,8 @@ export class WebgpuGfx implements Gfx<WebgpuMesh, GPUTexture> {
usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.SAMPLED, // eslint-disable-line no-undef
});
const row_pitch = Math.ceil((4 * width) / 256) * 256;
const data_size = row_pitch * height;
const bytes_per_row = Math.ceil((4 * width) / 256) * 256;
const data_size = bytes_per_row * height;
const buffer = this.device.createBuffer({
size: data_size,
@ -130,7 +130,7 @@ export class WebgpuGfx implements Gfx<WebgpuMesh, GPUTexture> {
for (let y = 0; y < height; y++) {
for (let x = 0; x < width; x++) {
const idx = 4 * x + row_pitch * y;
const idx = 4 * x + bytes_per_row * y;
buffer_data[idx] = orig_data[orig_idx];
buffer_data[idx + 1] = orig_data[orig_idx + 1];
@ -148,8 +148,8 @@ export class WebgpuGfx implements Gfx<WebgpuMesh, GPUTexture> {
command_encoder.copyBufferToTexture(
{
buffer,
rowPitch: row_pitch,
imageHeight: 0,
bytesPerRow: bytes_per_row,
rowsPerImage: 0,
},
{
texture,

2
src/core/rendering/webgpu/WebgpuRenderer.ts
View File

@ -65,7 +65,7 @@ export class WebgpuRenderer extends GfxRenderer {
});
const bind_group_layout = device.createBindGroupLayout({
bindings: [
entries: [
{
binding: 0,
visibility: GPUShaderStage.VERTEX, // eslint-disable-line no-undef

6
src/hunt_optimizer/gui/HuntOptimizerView.ts
View File

@ -27,7 +27,7 @@ export class HuntOptimizerView extends ResizableView {
title: "Optimize",
key: "optimize",
path: "/optimize",
create_view: async function() {
create_view: async () => {
return new (await import("./OptimizerView")).OptimizerView(
hunt_optimizer_stores,
);
@ -37,7 +37,7 @@ export class HuntOptimizerView extends ResizableView {
title: "Methods",
key: "methods",
path: "/methods",
create_view: async function() {
create_view: async () => {
return new (await import("./MethodsView")).MethodsView(
gui_store,
hunt_method_stores,
@ -48,7 +48,7 @@ export class HuntOptimizerView extends ResizableView {
title: "Help",
key: "help",
path: "/help",
create_view: async function() {
create_view: async () => {
return new (await import("./HelpView")).HelpView();
},
},

6
src/hunt_optimizer/gui/MethodsView.ts
View File

@ -14,7 +14,7 @@ export class MethodsView extends TabContainer {
title: "Episode I",
key: "episode_1",
path: "/methods/episode_1",
create_view: async function() {
create_view: async () => {
return new MethodsForEpisodeView(hunt_method_stores, Episode.I);
},
},
@ -22,7 +22,7 @@ export class MethodsView extends TabContainer {
title: "Episode II",
key: "episode_2",
path: "/methods/episode_2",
create_view: async function() {
create_view: async () => {
return new MethodsForEpisodeView(hunt_method_stores, Episode.II);
},
},
@ -30,7 +30,7 @@ export class MethodsView extends TabContainer {
title: "Episode IV",
key: "episode_4",
path: "/methods/episode_4",
create_view: async function() {
create_view: async () => {
return new MethodsForEpisodeView(hunt_method_stores, Episode.IV);
},
},

2
src/quest_editor/gui/LogView.ts
View File

@ -93,7 +93,7 @@ export class LogView extends ResizableView {
].join(" "),
},
div({ className: "quest_editor_LogView_message_timestamp" }, time_to_string(time)),
div({ className: "quest_editor_LogView_message_level" }, "[" + Severity[severity] + "]"),
div({ className: "quest_editor_LogView_message_level" }, `[${Severity[severity]}]`),
div({ className: "quest_editor_LogView_message_contents" }, message),
);
};

2
src/quest_editor/gui/QuestEditorView.ts
View File

@ -263,7 +263,7 @@ export class QuestEditorView extends ResizableView {
for (const { name, create } of this.view_map.values()) {
// registerComponent expects a regular function and not an arrow function. This
// function will be called with new.
layout.registerComponent(name, function(container: Container) {
layout.registerComponent(name, function (container: Container) {
let view: Widget & Resizable;
try {

10
src/quest_editor/gui/entity_dnd.ts
View File

@ -63,8 +63,9 @@ export function entity_dnd_source(
dragging_details.drag_element.style.zIndex = "500";
dragging_details.drag_element.style.top = "0";
dragging_details.drag_element.style.left = "0";
dragging_details.drag_element.style.transform = `translate(${e.clientX -
grab_point.x}px, ${e.clientY - grab_point.y}px)`;
dragging_details.drag_element.style.transform = `translate(${
e.clientX - grab_point.x
}px, ${e.clientY - grab_point.y}px)`;
document.body.append(dragging_details.drag_element);
if (e.dataTransfer) {
@ -109,8 +110,9 @@ function dragover(e: DragEvent): void {
}
if (dragging_details) {
dragging_details.drag_element.style.transform = `translate(${e.clientX -
grab_point.x}px, ${e.clientY - grab_point.y}px)`;
dragging_details.drag_element.style.transform = `translate(${e.clientX - grab_point.x}px, ${
e.clientY - grab_point.y
}px)`;
}
}

2
src/quest_editor/rendering/EntityImageRenderer.ts
View File

@ -46,7 +46,7 @@ export class EntityImageRenderer implements Disposable {
const entity_model = create_entity_type_mesh(entity, geometry, textures);
scene.add(entity_model);
const b_sphere = entity_model.geometry.boundingSphere;
const b_sphere = entity_model.geometry.boundingSphere!;
camera.position.copy(camera_position);
camera.position.multiplyScalar(b_sphere.radius * camera_dist_factor);
camera.lookAt(b_sphere.center);

2
src/quest_editor/rendering/Quest3DModelManager.ts
View File

@ -175,7 +175,7 @@ class Area3DModelManager {
render_geom: Object3D,
): void {
for (const collision_area of collision_geom.children) {
(collision_area as Mesh).geometry.boundingBox.getCenter(this.origin);
(collision_area as Mesh).geometry.boundingBox!.getCenter(this.origin);
this.raycaster.set(this.origin, this.down);
const intersection1 = this.raycaster

9
src/quest_editor/scripting/disassembly.ts
View File

@ -1,6 +1,13 @@
import { reinterpret_i32_as_f32 } from "../../core/primitive_conversion";
import { Arg, Segment, SegmentType } from "../../core/data_formats/asm/instructions";
import { AnyType, Kind, OP_VA_END, OP_VA_START, Param, StackInteraction } from "../../core/data_formats/asm/opcodes";
import {
AnyType,
Kind,
OP_VA_END,
OP_VA_START,
Param,
StackInteraction,
} from "../../core/data_formats/asm/opcodes";
import { LogManager } from "../../core/Logger";
import { number_to_hex_string } from "../../core/util";

8
src/quest_editor/scripting/vm/InstructionPointer.ts
View File

@ -1,4 +1,10 @@
import { AsmToken, Instruction, InstructionSegment, Segment, SegmentType } from "../../../core/data_formats/asm/instructions";
import {
AsmToken,
Instruction,
InstructionSegment,
Segment,
SegmentType,
} from "../../../core/data_formats/asm/instructions";
import { assert } from "../../../core/util";
export class InstructionPointer {

2
src/viewer/rendering/ModelRenderer.ts
View File

@ -157,7 +157,7 @@ export class ModelRenderer extends ThreeRenderer implements Disposable {
);
// Make sure we rotate around the center of the model instead of its origin.
const bb = geometry.boundingBox;
const bb = geometry.boundingBox!;
const height = bb.max.y - bb.min.y;
this.mesh.translateY(-height / 2 - bb.min.y);