Merge pull request #118 from Tarnadas/dev

Radar and Player position

README.md

@@ -14,4 +14,4 @@ Download the client/server/emulator bundle in the [release section](https://gith
 
 ## Server List
 
-There is a [public server list](https://smmdb.ddns.net/net64) of all Net64+ server, that have enabled listing.
+There is a [public server list](https://net64-mod.github.io/servers) of all Net64+ server, that have enabled listing.

compat-list.js

@@ -3,5 +3,6 @@ module.exports = function getCompatMin (currentVersion) {
   if (major === 2 && minor === 1) return [ '2', '0' ]
   if (major === 2 && minor === 2) return [ '2', '0' ]
   if (major === 2 && minor === 3) return [ '2', '0' ]
+  if (major === 2 && minor === 4) return [ '2', '0' ]
   throw new Error(`Compatibility list found unknown version ${currentVersion}`)
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "net64plus",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "compatVersion": "1.0.0",
   "description": "Net64+ client",
   "main": "index.js",
@@ -35,7 +35,7 @@
   "bugs": {
     "url": "https://github.com/Tarnadas/net64plus/issues"
   },
-  "homepage": "http://smmdb.ddns.net/net64",
+  "homepage": "https://net64-mod.github.io/",
   "jest": {
     "setupFiles": [
       "./jest-browser-setup.js"

src/main/Connection.ts

@@ -23,6 +23,7 @@ import {
 } from '../../proto/ServerClientMessage'
 
 const UPDATE_INTERVAL = 32
+const SLOW_UPDATE_INTERVAL = 200
 const MAX_SERVER_PLAYER = 24
 
 interface GameModeRPC {
@@ -90,6 +91,8 @@ export class Connection {
 
   private loop: NodeJS.Timer | null = null
 
+  private slowLoop: NodeJS.Timer | null = null
+
   private hasError: boolean = false
 
   private timer = Date.now()
@@ -111,6 +114,7 @@ export class Connection {
   }) {
     this.disconnect = this.disconnect.bind(this)
     this.sendAll = this.sendAll.bind(this)
+    this.updatePlayerPositions = this.updatePlayerPositions.bind(this)
     this.ws = new WS(`ws://${domain || ip || '127.0.0.1'}:${port || 3678}`)
     this.ws.on('open', this.onOpen.bind(this, characterId, username))
     this.ws.on('error', this.onError.bind(this))
@@ -182,6 +186,10 @@ export class Connection {
       clearInterval(this.loop)
       this.loop = null
     }
+    if (this.slowLoop) {
+      clearInterval(this.slowLoop)
+      this.slowLoop = null
+    }
     connector.closeWebSocket(code, this.hasError)
     updateRPC(
       {
@@ -314,6 +322,7 @@ export class Connection {
     emulator!.setGameMode(handshake.gameMode)
     connector.setPlayerId(this.playerId)
     this.loop = setInterval(this.sendAll, UPDATE_INTERVAL)
+    this.slowLoop = setInterval(this.updatePlayerPositions, SLOW_UPDATE_INTERVAL)
   }
 
   /**
@@ -428,6 +437,7 @@ export class Connection {
     if (playerId == null) return
     this.playerId = playerId
     emulator!.setPlayerId(playerId)
+    connector.setPlayerId(playerId)
   }
 
   /**
@@ -660,6 +670,12 @@ export class Connection {
     }
   }
 
+  private updatePlayerPositions (): void {
+    if (!emulator) return
+    const positions = emulator.getPlayerPositions()
+    connector.updatePlayerPositions(positions)
+  }
+
   /**
    * Send password to server.
    *

src/main/Connector.ts

@@ -2,7 +2,7 @@ import { ipcMain } from 'electron'
 
 import { emulator, createEmulator, deleteEmulator, connection, createConnection, deleteConnection } from '.'
 import { Emulator } from './Emulator'
-import { FilteredEmulator } from '../models/Emulator.model'
+import { FilteredEmulator, Position } from '../models/Emulator.model'
 import { MainMessage, RendererMessage } from '../models/Message.model'
 import { Server } from '../models/Server.model'
 import { IPlayerUpdate, IPlayer } from '../../proto/ServerClientMessage'
@@ -113,6 +113,10 @@ export class Connector {
     this.window.webContents.send(MainMessage.SET_PLAYER_ID, playerId)
   }
 
+  public updatePlayerPositions (positions: {self: Position, cameraAngle: number, positions: (Position | null)[]}): void {
+    this.window.webContents.send(MainMessage.UPDATE_PLAYER_POSITIONS, positions)
+  }
+
   public setGameMode (gameMode: number): void {
     this.window.webContents.send(MainMessage.GAME_MODE, gameMode)
   }

src/main/Emulator.ts

@@ -7,7 +7,8 @@ import { promisify } from 'util'
 import { spawn } from 'child_process'
 
 import { connector, deleteEmulator } from '.'
-import { FilteredEmulator } from '../models/Emulator.model'
+import { FilteredEmulator, Position } from '../models/Emulator.model'
+import { testEmulatorPid, TestProcess } from '../models/Emulator.mock'
 import { buf2hex } from '../utils/Buffer.util'
 import winprocess, { Process } from '../declarations/winprocess'
 
@@ -118,7 +119,7 @@ export class Emulator {
    */
   constructor (processId: number, characterId: number, inGameChatEnabled = false) {
     this.inGameChatEnabled = inGameChatEnabled
-    this.process = winProcess.Process(processId)
+    this.process = processId === testEmulatorPid ? new TestProcess() : winProcess.Process(processId)
     this.process.open()
     this.baseAddress = -1
     for (let i = 0x00000000; i <= 0x72D00000; i += 0x1000) {
@@ -201,7 +202,7 @@ export class Emulator {
         errorMessage = 'Insufficient permission to read memory. Try starting Net64+ with admin privileges'
         break
       case 299:
-        errorMessage = 'Your memory is not set to 16MB. RTFM!'
+        errorMessage = 'Your memory is not set to 16MB. You are either not using the shipped emulator or you did not restart the emulator after chaning your settings to 16MB'
         break
     }
     connector.setEmulatorError(errorMessage)
@@ -277,4 +278,36 @@ export class Emulator {
       console.error(err)
     }
   }
+
+  public getPlayerRotation (): number {
+    return this.readMemory(0xFF7709, 1).readUInt8(0)
+  }
+
+  public getPlayerPositions (): {self: Position, cameraAngle: number, positions: (Position | null)[]} {
+    const positions: (Position | null)[] = new Array(24).fill(null)
+    const x = this.readMemory(0xFF7706, 2).readInt16LE(0)
+    const y = this.readMemory(0xFF770A, 2).readInt16LE(0)
+    const rotation = this.readMemory(0xFF7708, 2).readUInt16LE(0)
+    const map = this.readMemory(0xFF770F, 1).readUInt8(0)
+    const self: Position = {
+      x,
+      y,
+      rotation,
+      course: map
+    }
+    for (let offset = 0xFF7800, i = 0; offset < 0xFF9100; offset += 0x100, i++) {
+      const x = this.readMemory(offset + 6, 2).readInt16LE(0)
+      const y = this.readMemory(offset + 0xA, 2).readInt16LE(0)
+      const rotation = this.readMemory(offset + 8, 2).readUInt16LE(0)
+      const map = this.readMemory(offset + 0xF, 1).readUInt8(0)
+      positions[i] = {
+        x,
+        y,
+        rotation,
+        course: map
+      }
+    }
+    const cameraAngle = this.readMemory(0x33c6e4, 2).readUInt16LE(0)
+    return {self, cameraAngle, positions}
+  }
 }

src/models/Emulator.mock.ts

@@ -0,0 +1,53 @@
+import { FilteredEmulator } from './Emulator.model';
+import { Process } from '../declarations/winprocess';
+
+export const testEmulatorPid = -1337
+
+export const testEmulator: FilteredEmulator = {
+  name: 'Test Emu',
+  pid: testEmulatorPid,
+  windowName: 'Test Super Mario 64 - Project64'
+}
+
+const MEMORY_SIZE = 0xFFFFFF
+const PLAYER_POS_X_OFFSET = 0xFF7706
+const PLAYER_POS_Y_OFFSET = 0xFF770A
+const PLAYER_ROTATION_OFFSET = 0xFF7708
+const PLAYER_COURSE_OFFSET = 0xFF770F
+
+export class TestProcess implements Process {
+  private memory = Buffer.alloc(MEMORY_SIZE)
+
+  constructor() {
+    this.memory.writeUInt32LE(0x3C1A8032, 0)
+    this.memory.writeUInt32LE(0x275A7650, 4)
+    this.memory.writeInt16LE(0x1000, PLAYER_POS_X_OFFSET)
+    this.memory.writeInt16LE(-0x800, PLAYER_POS_Y_OFFSET)
+    setInterval(this.updatePlayerLocation.bind(this), 500)
+  }
+
+  private updatePlayerLocation () {
+    for (let offset = 0; offset <= 0x100; offset += 0x100) {
+      this.memory.writeInt16LE((this.memory.readInt16LE(PLAYER_POS_X_OFFSET + offset) - 1), PLAYER_POS_X_OFFSET + offset)
+      this.memory.writeInt16LE((this.memory.readInt16LE(PLAYER_POS_Y_OFFSET + offset) - 1), PLAYER_POS_Y_OFFSET + offset)
+      this.memory.writeUInt16LE(((this.memory.readUInt16LE(PLAYER_ROTATION_OFFSET + offset) + 0x80) % 0xFFFF), PLAYER_ROTATION_OFFSET + offset)
+      this.memory.writeUInt8(4, PLAYER_COURSE_OFFSET + offset)
+    }
+  }
+
+  public open () {}
+
+  public readMemory (offset: number, length: number): number | Buffer {
+    let buffer: Buffer
+    if (offset + length > MEMORY_SIZE) {
+      buffer = Buffer.alloc(length)
+    } else {
+      buffer = this.memory.slice(offset, offset + length)
+    }
+    return buffer
+  }
+
+  public writeMemory (offset: number, buffer: Buffer) {
+    this.memory.fill(buffer, offset, offset + buffer.length)
+  }
+}

src/models/Emulator.model.ts

@@ -1,5 +1,22 @@
+import { IPlayer } from "../../proto/ServerClientMessage";
+
 export interface FilteredEmulator {
   name: string
   pid: number
   windowName?: string
 }
+
+export interface Position {
+  x: number
+  y: number
+  rotation: number
+  course: number
+}
+
+export interface Player extends IPlayer {
+  position?: Position
+}
+
+export const CHARACTER_IMAGES = [
+  'mario.png', 'luigi.png', 'yoshi.png', 'wario.png', 'peach.png', 'toad.png', 'waluigi.png', 'rosalina.png', 'sonic.png', 'knuckles.png', 'goomba.png', 'kirby.png'
+]

src/models/Message.model.ts

@@ -7,6 +7,7 @@ export enum MainMessage {
   SET_PLAYERS = 'SET_PLAYERS',
   SET_PLAYER = 'SET_PLAYER',
   SET_PLAYER_ID = 'SET_PLAYER_ID',
+  UPDATE_PLAYER_POSITIONS = 'UPDATE_PLAYER_POSITIONS',
   GAME_MODE = 'GAME_MODE',
   SERVER_FULL = 'SERVER_FULL',
   WRONG_VERSION = 'WRONG_VERSION',

src/models/Server.model.ts

@@ -1,4 +1,4 @@
-import { IPlayer } from '../../proto/ServerClientMessage'
+import { Player } from './Emulator.model'
 
 export interface Server {
   id?: string
@@ -7,10 +7,16 @@ export interface Server {
   port: number
   name?: string
   description?: string
-  players?: IPlayer[]
+  players?: (Player | null)[]
   countryCode?: string
   gameMode?: number
   version?: string
   passwordRequired?: boolean | null
   isDedicated?: boolean
 }
+
+export interface Course {
+  short: string
+  long: string
+  icon: string
+}

src/models/State.model.ts

@@ -1,7 +1,7 @@
 import { RouterState as ReactRouterState } from 'react-router-redux'
 
 import { Server } from './Server.model'
-import { FilteredEmulator } from './Emulator.model'
+import { FilteredEmulator, Position } from './Emulator.model'
 import { ChildProcess } from 'child_process'
 
 export interface ElectronServerSaveDataDraft {
@@ -39,6 +39,9 @@ export type RouterState = Readonly<RouterStateDraft>
 
 export interface ConnectionStateDraft {
   server: Server | null
+  playerId: number | null
+  selfPos: Position
+  cameraAngle: number
   authenticated: boolean
   authenticationThrottle: number
   hasToken: boolean

src/renderer/Connector.ts

@@ -12,13 +12,16 @@ import {
   setGameMode,
   setPlayer,
   setPlayers,
-  setServer
+  setServer,
+  updatePlayerPositions,
+  setPlayerId
 } from './actions/connection'
 import { isConnectedToEmulator, setEmulatorError, updateEmulators } from './actions/emulator'
 import { MainMessage, RendererMessage } from '../models/Message.model'
 import { Server } from '../models/Server.model'
 import { IPlayer, IPlayerUpdate } from '../../proto/ServerClientMessage'
-import { FilteredEmulator } from '../models/Emulator.model'
+import { FilteredEmulator, Position } from '../models/Emulator.model'
+import { testEmulator } from '../models/Emulator.mock'
 
 export class Connector {
   constructor () {
@@ -30,6 +33,7 @@ export class Connector {
     ipcRenderer.on(MainMessage.SET_PLAYERS, this.onSetPlayers)
     ipcRenderer.on(MainMessage.SET_PLAYER, this.onSetPlayer)
     ipcRenderer.on(MainMessage.SET_PLAYER_ID, this.onSetPlayerId)
+    ipcRenderer.on(MainMessage.UPDATE_PLAYER_POSITIONS, this.onUpdatePlayerPositions)
     ipcRenderer.on(MainMessage.GAME_MODE, this.onSetGameMode)
     ipcRenderer.on(MainMessage.SERVER_FULL, this.onServerFull)
     ipcRenderer.on(MainMessage.WRONG_VERSION, this.onWrongVersion)
@@ -67,9 +71,16 @@ export class Connector {
   }
 
   private onUpdateEmulators = (_: Electron.Event, emulators: FilteredEmulator[]) => {
+    if (process.env.NODE_ENV === 'development') {
+      emulators.push(testEmulator)
+    }
     store.dispatch(updateEmulators(emulators))
   }
 
+  private onUpdatePlayerPositions = (_: Electron.Event, positions: {self: Position, cameraAngle: number, positions: (Position | null)[]}) => {
+    store.dispatch(updatePlayerPositions(positions))
+  }
+
   private onSetServer = (_: Electron.Event, server: Server) => {
     if (process.env.NODE_ENV === 'development') {
       console.info('CONNECTED TO SERVER', server)
@@ -90,6 +101,7 @@ export class Connector {
 
   private onSetPlayerId = (_: Electron.Event, playerId: number) => {
     addGlobalMessage('Connected', '[SERVER]', true)
+    store.dispatch(setPlayerId(playerId))
   }
 
   private onSetGameMode = (_: Electron.Event, gameMode: number) => {
@@ -123,8 +135,8 @@ export class Connector {
     { message: string, senderId: number }
   ) => {
     const server = store.getState().connection.server
-    if (!server || !server.players) return
-    const username = server.players[senderId] && server.players[senderId].username
+    if (!server || !server.players || !server.players[senderId]) return
+    const username = server.players[senderId] && server.players[senderId]!.username
     addGlobalMessage(message, username || '?', false)
   }
 

src/renderer/Request.ts

@@ -23,7 +23,7 @@ class Request {
   constructor () {
     this.smmdb = axios.create({
       // baseURL: 'http://localhost:8080/api',
-      baseURL: 'https://smmdb.ddns.net/api/',
+      baseURL: 'https://smmdb.net/api/',
       responseType: 'json'
     })
     let githubApiKey = process.env.NODE_ENV === 'development'