Skip to content

Commit

Permalink
feat: additional game scene drawing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ultraviolet-jordan
ultraviolet-jordan committed Jan 7, 2024
1 parent d87391e commit fd355f5
Show file tree
Hide file tree
Showing 12 changed files with 985 additions and 106 deletions.
607 changes: 587 additions & 20 deletions src/js/client.ts
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/jagex2/client/GameShell.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ export default abstract class GameShell {
this.frameTime[this.fpos] = (performance.now() - time) / 1000;
this.fpos = (this.fpos + 1) % this.frameTime.length;

console.log(`${this.fps} fps`);
console.log(`${this.ms.toFixed(4)} ms`);
// console.log(`${this.fps} fps`);
// console.log(`${this.ms.toFixed(4)} ms`);
}
if (this.state == -1) {
this.shutdown();
Expand Down
156 changes: 107 additions & 49 deletions src/js/jagex2/config/ComType.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Jagfile from '../io/Jagfile';
import Packet from '../io/Packet';
import Pix24 from '../graphics/Pix24';
import PixFont from '../graphics/PixFont';
import Model from '../graphics/Model';

export default class ComType {
static instances: ComType[] = [];
Expand All @@ -14,7 +16,7 @@ export default class ComType {
static TYPE_MODEL: number = 6;
static TYPE_INVENTORY_TEXT: number = 7;

static unpack = (interfaces: Jagfile, media: Jagfile): void => {
static unpack = (interfaces: Jagfile, media: Jagfile, fonts: PixFont[]): void => {
const dat: Packet = new Packet(interfaces.read('data'));
let parentId = -1;
dat.pos += 2; // const count = dat.g2;
Expand Down Expand Up @@ -87,6 +89,9 @@ export default class ComType {
dat.pos += 10;
break;
case ComType.TYPE_INVENTORY: {
com.inventorySlotObjId = new Int32Array(com.width * com.height);
com.inventorySlotObjCount = new Int32Array(com.width * com.height);

com.inventoryDraggable = dat.g1 === 1;
com.inventoryInteractable = dat.g1 === 1;
com.inventoryUsable = dat.g1 === 1;
Expand Down Expand Up @@ -125,59 +130,71 @@ export default class ComType {
}
case ComType.TYPE_RECT:
com.fill = dat.g1 === 1;
com.colour = dat.g4;
com.activeColour = dat.g4;
com.overColour = dat.g4;
com.color = dat.g4;
com.activeColor = dat.g4;
com.hoverColor = dat.g4;
break;
case ComType.TYPE_TEXT:
com.center = dat.g1 === 1;
com.font = dat.g1;
com.shadowed = dat.g1 === 1;
com.font = fonts[dat.g1];
com.shadow = dat.g1 === 1;
com.text = dat.gjstr;
com.activeText = dat.gjstr;
com.colour = dat.g4;
com.activeColour = dat.g4;
com.overColour = dat.g4;
com.color = dat.g4;
com.activeColor = dat.g4;
com.hoverColor = dat.g4;
break;
case ComType.TYPE_SPRITE:
com.graphic = dat.gjstr;
com.activeGraphic = dat.gjstr;
case ComType.TYPE_SPRITE: {
const image = dat.gjstr;
if (image.length > 0) {
const spriteIndex = image.lastIndexOf(',');
com.image = Pix24.fromArchive(media, image.substring(0, spriteIndex), parseInt(image.substring(spriteIndex + 1)));
}
const activeImage = dat.gjstr;
if (activeImage.length > 0) {
const spriteIndex = activeImage.lastIndexOf(',');
com.image = Pix24.fromArchive(media, activeImage.substring(0, spriteIndex), parseInt(activeImage.substring(spriteIndex + 1)));
}
break;
}
case ComType.TYPE_MODEL: {
com.model = dat.g1;
if (com.model != 0) {
com.model = ((com.model - 1) << 8) + dat.g1;
const model = dat.g1;
if (model !== 0) {
com.model = this.getModel(((model - 1) << 8) + dat.g1);
}

com.activeModel = dat.g1;
if (com.activeModel != 0) {
com.activeModel = ((com.activeModel - 1) << 8) + dat.g1;
const activeModel = dat.g1;
if (activeModel !== 0) {
com.activeModel = this.getModel(((activeModel - 1) << 8) + dat.g1);
}

com.anim = dat.g1;
if (com.anim == 0) {
com.anim = -1;
com.seqId = dat.g1;
if (com.seqId == 0) {
com.seqId = -1;
} else {
com.anim = ((com.anim - 1) << 8) + dat.g1;
com.seqId = ((com.seqId - 1) << 8) + dat.g1;
}

com.activeAnim = dat.g1;
if (com.activeAnim == 0) {
com.activeAnim = -1;
com.activeSeqId = dat.g1;
if (com.activeSeqId == 0) {
com.activeSeqId = -1;
} else {
com.activeAnim = ((com.activeAnim - 1) << 8) + dat.g1;
com.activeSeqId = ((com.activeSeqId - 1) << 8) + dat.g1;
}

com.zoom = dat.g2;
com.xan = dat.g2;
com.yan = dat.g2;
com.modelZoom = dat.g2;
com.modelPitch = dat.g2;
com.modelYaw = dat.g2;
break;
}
case ComType.TYPE_INVENTORY_TEXT: {
com.inventorySlotObjId = new Int32Array(com.width * com.height);
com.inventorySlotObjCount = new Int32Array(com.width * com.height);

com.center = dat.g1 === 1;
com.font = dat.g1;
com.shadowed = dat.g1 === 1;
com.colour = dat.g4;
com.font = fonts[dat.g1];
com.shadow = dat.g1 === 1;
com.color = dat.g4;
com.inventoryMarginX = dat.g2b;
com.inventoryMarginY = dat.g2b;
com.inventoryInteractable = dat.g1 === 1;
Expand Down Expand Up @@ -215,10 +232,14 @@ export default class ComType {

static get = (id: number): ComType => ComType.instances[id];

static getModel = (id: number): Model => {
// TODO
return new Model(id);
};

// ----
id: number = -1;
parentId: number = -1;
comName: string | null = null;
type: number = -1;
optionType: number = -1;
contentType: number = 0;
Expand All @@ -240,24 +261,24 @@ export default class ComType {
inventorySlotImage: Pix24[] | null = null;
// inventoryOptions: (string | null)[] = [];
inventoryOptions: Array<string | null> = [];
fill = false;
center = false;
font: number = 0;
shadowed = false;
fill: boolean = false;
center: boolean = false;
font: PixFont | null = null;
shadow: boolean = false;
text: string | null = null;
activeText: string | null = null;
colour: number = 0;
activeColour: number = 0;
overColour: number = 0;
graphic: string | null = null;
activeGraphic: string | null = null;
model: number = -1;
activeModel: number = -1;
anim: number = -1;
activeAnim: number = -1;
zoom: number = 0;
xan: number = 0;
yan: number = 0;
color: number = 0;
activeColor: number = 0;
hoverColor: number = 0;
image: Pix24 | null = null;
activeImage: Pix24 | null = null;
model: Model | null = null;
activeModel: Model | null = null;
seqId: number = -1;
activeSeqId: number = -1;
modelZoom: number = 0;
modelPitch: number = 0;
modelYaw: number = 0;
spellAction: string | null = null;
spellName: string | null = null;
spellFlags: number = -1;
Expand All @@ -267,5 +288,42 @@ export default class ComType {
childY: Uint16Array | null = null;

// other
x: number = 0;
y: number = 0;
scrollPosition: number = 0;
inventorySlotObjId: Int32Array | null = null;
inventorySlotObjCount: Int32Array | null = null;
seqFrame: number = 0;

getModel = (primaryFrame: number, secondaryFrame: number, active: boolean): Model | null => {
let m = this.model;
if (active) {
m = this.activeModel;
}

if (m == null) {
return null;
}

if (primaryFrame == -1 && secondaryFrame == -1 && m.faceColor == null) {
return m;
}

// const tmp = new Model(m, true, true, false);
// if (primaryFrame != -1 || secondaryFrame != -1) {
// tmp.createLabelReferences();
// }
//
// if (primaryFrame != -1) {
// tmp.applyTransform(primaryFrame);
// }
//
// if (secondaryFrame != -1) {
// tmp.applyTransform(secondaryFrame);
// }
//
// tmp.calculateNormals(64, 768, -50, -10, -50, true);
// return tmp;
return null; // TODO
};
}
6 changes: 6 additions & 0 deletions src/js/jagex2/config/ObjType.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Jagfile from '../io/Jagfile';
import {ConfigType} from './ConfigType';
import Packet from '../io/Packet';
import Pix24 from '../graphics/Pix24';

export default class ObjType extends ConfigType {
static count: number = 0;
Expand Down Expand Up @@ -31,6 +32,11 @@ export default class ObjType extends ConfigType {

static get = (id: number): ObjType => ObjType.instances[id];

static getIcon = (id: number, count: number): Pix24 => {
// TODO
return new Pix24(32, 32);
};

// ----

model: number = 0;
Expand Down
23 changes: 23 additions & 0 deletions src/js/jagex2/datastruct/JString.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,27 @@ export default class JString {
}
return temp;
};

static formatName = (str: string): string => {
if (str.length == 0) {
return str;
}

const chars: string[] = [...str];
for (let i = 0; i < chars.length; i++) {
if (chars[i] == '_') {
chars[i] = ' ';

if (i + 1 < chars.length && chars[i + 1] >= 'a' && chars[i + 1] <= 'z') {
chars[i + 1] = String.fromCharCode(chars[i + 1].charCodeAt(0) + 'A'.charCodeAt(0) - 97);
}
}
}

if (chars[0] >= 'a' && chars[0] <= 'z') {
chars[0] = String.fromCharCode(chars[0].charCodeAt(0) + 'A'.charCodeAt(0) - 97);
}

return chars.join('');
};
}
Loading

0 comments on commit fd355f5

Please sign in to comment.