diff --git a/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceParam.py b/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceParam.py new file mode 100644 index 00000000..0664ce33 --- /dev/null +++ b/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceParam.py @@ -0,0 +1,66 @@ +# automatically generated by the FlatBuffers compiler, do not modify + +# namespace: Packets + +import flatbuffers +from flatbuffers.compat import import_numpy +np = import_numpy() + +class GetPageSourceParam(object): + __slots__ = ['_tab'] + + @classmethod + def GetRootAs(cls, buf, offset=0): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) + x = GetPageSourceParam() + x.Init(buf, n + offset) + return x + + @classmethod + def GetRootAsGetPageSourceParam(cls, buf, offset=0): + """This method is deprecated. Please switch to GetRootAs.""" + return cls.GetRootAs(buf, offset) + # GetPageSourceParam + def Init(self, buf, pos): + self._tab = flatbuffers.table.Table(buf, pos) + +def GetPageSourceParamStart(builder): builder.StartObject(0) +def Start(builder): + return GetPageSourceParamStart(builder) +def GetPageSourceParamEnd(builder): return builder.EndObject() +def End(builder): + return GetPageSourceParamEnd(builder) + +class GetPageSourceParamT(object): + + # GetPageSourceParamT + def __init__(self): + pass + + @classmethod + def InitFromBuf(cls, buf, pos): + getPageSourceParam = GetPageSourceParam() + getPageSourceParam.Init(buf, pos) + return cls.InitFromObj(getPageSourceParam) + + @classmethod + def InitFromPackedBuf(cls, buf, pos=0): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, pos) + return cls.InitFromBuf(buf, pos+n) + + @classmethod + def InitFromObj(cls, getPageSourceParam): + x = GetPageSourceParamT() + x._UnPack(getPageSourceParam) + return x + + # GetPageSourceParamT + def _UnPack(self, getPageSourceParam): + if getPageSourceParam is None: + return + + # GetPageSourceParamT + def Pack(self, builder): + GetPageSourceParamStart(builder) + getPageSourceParam = GetPageSourceParamEnd(builder) + return getPageSourceParam diff --git a/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceResult.py b/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceResult.py new file mode 100644 index 00000000..3e999715 --- /dev/null +++ b/client/python/gamium/gamium/Protocol/generated/Packets/GetPageSourceResult.py @@ -0,0 +1,81 @@ +# automatically generated by the FlatBuffers compiler, do not modify + +# namespace: Packets + +import flatbuffers +from flatbuffers.compat import import_numpy +np = import_numpy() + +class GetPageSourceResult(object): + __slots__ = ['_tab'] + + @classmethod + def GetRootAs(cls, buf, offset=0): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) + x = GetPageSourceResult() + x.Init(buf, n + offset) + return x + + @classmethod + def GetRootAsGetPageSourceResult(cls, buf, offset=0): + """This method is deprecated. Please switch to GetRootAs.""" + return cls.GetRootAs(buf, offset) + # GetPageSourceResult + def Init(self, buf, pos): + self._tab = flatbuffers.table.Table(buf, pos) + + # GetPageSourceResult + def PageSource(self): + o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4)) + if o != 0: + return self._tab.String(o + self._tab.Pos) + return None + +def GetPageSourceResultStart(builder): builder.StartObject(1) +def Start(builder): + return GetPageSourceResultStart(builder) +def GetPageSourceResultAddPageSource(builder, pageSource): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pageSource), 0) +def AddPageSource(builder, pageSource): + return GetPageSourceResultAddPageSource(builder, pageSource) +def GetPageSourceResultEnd(builder): return builder.EndObject() +def End(builder): + return GetPageSourceResultEnd(builder) + +class GetPageSourceResultT(object): + + # GetPageSourceResultT + def __init__(self): + self.pageSource = None # type: str + + @classmethod + def InitFromBuf(cls, buf, pos): + getPageSourceResult = GetPageSourceResult() + getPageSourceResult.Init(buf, pos) + return cls.InitFromObj(getPageSourceResult) + + @classmethod + def InitFromPackedBuf(cls, buf, pos=0): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, pos) + return cls.InitFromBuf(buf, pos+n) + + @classmethod + def InitFromObj(cls, getPageSourceResult): + x = GetPageSourceResultT() + x._UnPack(getPageSourceResult) + return x + + # GetPageSourceResultT + def _UnPack(self, getPageSourceResult): + if getPageSourceResult is None: + return + self.pageSource = getPageSourceResult.PageSource() + + # GetPageSourceResultT + def Pack(self, builder): + if self.pageSource is not None: + pageSource = builder.CreateString(self.pageSource) + GetPageSourceResultStart(builder) + if self.pageSource is not None: + GetPageSourceResultAddPageSource(builder, pageSource) + getPageSourceResult = GetPageSourceResultEnd(builder) + return getPageSourceResult diff --git a/client/python/gamium/gamium/Protocol/generated/Param.py b/client/python/gamium/gamium/Protocol/generated/Param.py index 076add46..f9e34a34 100644 --- a/client/python/gamium/gamium/Protocol/generated/Param.py +++ b/client/python/gamium/gamium/Protocol/generated/Param.py @@ -15,6 +15,7 @@ class Param(object): Packets_DumpObjectsHierarchyParam = 9 Packets_ChangeConfigurationParam = 10 Packets_QueryProfileParam = 11 + Packets_GetPageSourceParam = 12 def ParamCreator(unionType, table): from flatbuffers.table import Table @@ -53,4 +54,7 @@ def ParamCreator(unionType, table): if unionType == Param().Packets_QueryProfileParam: import gamium.protocol.generated.Packets.QueryProfileParam return gamium.protocol.generated.Packets.QueryProfileParam.QueryProfileParamT.InitFromBuf(table.Bytes, table.Pos) + if unionType == Param().Packets_GetPageSourceParam: + import gamium.protocol.generated.Packets.GetPageSourceParam + return gamium.protocol.generated.Packets.GetPageSourceParam.GetPageSourceParamT.InitFromBuf(table.Bytes, table.Pos) return None diff --git a/client/python/gamium/gamium/Protocol/generated/Request.py b/client/python/gamium/gamium/Protocol/generated/Request.py index 6dccef43..69ad6f5a 100644 --- a/client/python/gamium/gamium/Protocol/generated/Request.py +++ b/client/python/gamium/gamium/Protocol/generated/Request.py @@ -68,6 +68,7 @@ def End(builder): import gamium.protocol.generated.Packets.DumpObjectsHierarchyParam import gamium.protocol.generated.Packets.ExecuteRpcParam import gamium.protocol.generated.Packets.FindObjectsParam +import gamium.protocol.generated.Packets.GetPageSourceParam import gamium.protocol.generated.Packets.HelloParam import gamium.protocol.generated.Packets.InspectObjectOnScreenParam import gamium.protocol.generated.Packets.InspectObjectWithIdParam @@ -86,7 +87,7 @@ class RequestT(object): def __init__(self): self.seq = 0 # type: int self.paramType = 0 # type: int - self.param = None # type: Union[None, gamium.protocol.generated.Packets.HelloParam.HelloParamT, gamium.protocol.generated.Packets.QueryScreenParam.QueryScreenParamT, gamium.protocol.generated.Packets.FindObjectsParam.FindObjectsParamT, gamium.protocol.generated.Packets.QueryObjectInteractableParam.QueryObjectInteractableParamT, gamium.protocol.generated.Packets.ActionsParam.ActionsParamT, gamium.protocol.generated.Packets.ExecuteRpcParam.ExecuteRpcParamT, gamium.protocol.generated.Packets.InspectObjectOnScreenParam.InspectObjectOnScreenParamT, gamium.protocol.generated.Packets.InspectObjectWithIdParam.InspectObjectWithIdParamT, gamium.protocol.generated.Packets.DumpObjectsHierarchyParam.DumpObjectsHierarchyParamT, gamium.protocol.generated.Packets.ChangeConfigurationParam.ChangeConfigurationParamT, gamium.protocol.generated.Packets.QueryProfileParam.QueryProfileParamT] + self.param = None # type: Union[None, gamium.protocol.generated.Packets.HelloParam.HelloParamT, gamium.protocol.generated.Packets.QueryScreenParam.QueryScreenParamT, gamium.protocol.generated.Packets.FindObjectsParam.FindObjectsParamT, gamium.protocol.generated.Packets.QueryObjectInteractableParam.QueryObjectInteractableParamT, gamium.protocol.generated.Packets.ActionsParam.ActionsParamT, gamium.protocol.generated.Packets.ExecuteRpcParam.ExecuteRpcParamT, gamium.protocol.generated.Packets.InspectObjectOnScreenParam.InspectObjectOnScreenParamT, gamium.protocol.generated.Packets.InspectObjectWithIdParam.InspectObjectWithIdParamT, gamium.protocol.generated.Packets.DumpObjectsHierarchyParam.DumpObjectsHierarchyParamT, gamium.protocol.generated.Packets.ChangeConfigurationParam.ChangeConfigurationParamT, gamium.protocol.generated.Packets.QueryProfileParam.QueryProfileParamT, gamium.protocol.generated.Packets.GetPageSourceParam.GetPageSourceParamT] @classmethod def InitFromBuf(cls, buf, pos): diff --git a/client/python/gamium/gamium/Protocol/generated/Response.py b/client/python/gamium/gamium/Protocol/generated/Response.py index 77bd45e1..fef8927f 100644 --- a/client/python/gamium/gamium/Protocol/generated/Response.py +++ b/client/python/gamium/gamium/Protocol/generated/Response.py @@ -82,6 +82,7 @@ def End(builder): import gamium.protocol.generated.Packets.DumpObjectsHierarchyResult import gamium.protocol.generated.Packets.ExecuteRpcResult import gamium.protocol.generated.Packets.FindObjectsResult +import gamium.protocol.generated.Packets.GetPageSourceResult import gamium.protocol.generated.Packets.HelloResult import gamium.protocol.generated.Packets.InspectObjectOnScreenResult import gamium.protocol.generated.Packets.InspectObjectWithIdResult @@ -102,7 +103,7 @@ def __init__(self): self.seq = 0 # type: int self.error = None # type: Optional[gamium.protocol.generated.Types.ErrorResult.ErrorResultT] self.resultType = 0 # type: int - self.result = None # type: Union[None, gamium.protocol.generated.Packets.HelloResult.HelloResultT, gamium.protocol.generated.Packets.QueryScreenResult.QueryScreenResultT, gamium.protocol.generated.Packets.FindObjectsResult.FindObjectsResultT, gamium.protocol.generated.Packets.QueryObjectInteractableResult.QueryObjectInteractableResultT, gamium.protocol.generated.Packets.ActionsResult.ActionsResultT, gamium.protocol.generated.Packets.ExecuteRpcResult.ExecuteRpcResultT, gamium.protocol.generated.Packets.InspectObjectOnScreenResult.InspectObjectOnScreenResultT, gamium.protocol.generated.Packets.InspectObjectWithIdResult.InspectObjectWithIdResultT, gamium.protocol.generated.Packets.DumpObjectsHierarchyResult.DumpObjectsHierarchyResultT, gamium.protocol.generated.Packets.ChangeConfigurationResult.ChangeConfigurationResultT, gamium.protocol.generated.Packets.QueryProfileResult.QueryProfileResultT] + self.result = None # type: Union[None, gamium.protocol.generated.Packets.HelloResult.HelloResultT, gamium.protocol.generated.Packets.QueryScreenResult.QueryScreenResultT, gamium.protocol.generated.Packets.FindObjectsResult.FindObjectsResultT, gamium.protocol.generated.Packets.QueryObjectInteractableResult.QueryObjectInteractableResultT, gamium.protocol.generated.Packets.ActionsResult.ActionsResultT, gamium.protocol.generated.Packets.ExecuteRpcResult.ExecuteRpcResultT, gamium.protocol.generated.Packets.InspectObjectOnScreenResult.InspectObjectOnScreenResultT, gamium.protocol.generated.Packets.InspectObjectWithIdResult.InspectObjectWithIdResultT, gamium.protocol.generated.Packets.DumpObjectsHierarchyResult.DumpObjectsHierarchyResultT, gamium.protocol.generated.Packets.ChangeConfigurationResult.ChangeConfigurationResultT, gamium.protocol.generated.Packets.QueryProfileResult.QueryProfileResultT, gamium.protocol.generated.Packets.GetPageSourceResult.GetPageSourceResultT] @classmethod def InitFromBuf(cls, buf, pos): diff --git a/client/python/gamium/gamium/Protocol/generated/Result.py b/client/python/gamium/gamium/Protocol/generated/Result.py index 4fa7e682..2b91dd90 100644 --- a/client/python/gamium/gamium/Protocol/generated/Result.py +++ b/client/python/gamium/gamium/Protocol/generated/Result.py @@ -15,6 +15,7 @@ class Result(object): Packets_DumpObjectsHierarchyResult = 9 Packets_ChangeConfigurationResult = 10 Packets_QueryProfileResult = 11 + Packets_GetPageSourceResult = 12 def ResultCreator(unionType, table): from flatbuffers.table import Table @@ -53,4 +54,7 @@ def ResultCreator(unionType, table): if unionType == Result().Packets_QueryProfileResult: import gamium.protocol.generated.Packets.QueryProfileResult return gamium.protocol.generated.Packets.QueryProfileResult.QueryProfileResultT.InitFromBuf(table.Bytes, table.Pos) + if unionType == Result().Packets_GetPageSourceResult: + import gamium.protocol.generated.Packets.GetPageSourceResult + return gamium.protocol.generated.Packets.GetPageSourceResult.GetPageSourceResultT.InitFromBuf(table.Bytes, table.Pos) return None diff --git a/client/python/gamium/pyproject.toml b/client/python/gamium/pyproject.toml index 85cd29f7..67abbe9e 100644 --- a/client/python/gamium/pyproject.toml +++ b/client/python/gamium/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gamium" -version = "2.0.0" +version = "2.0.1" description = "" authors = ["dogu"] readme = "README.md" diff --git a/client/typescript/gamium/package.json b/client/typescript/gamium/package.json index f119abb2..2050bf36 100644 --- a/client/typescript/gamium/package.json +++ b/client/typescript/gamium/package.json @@ -1,9 +1,33 @@ { "name": "gamium", - "version": "2.0.0", + "version": "2.0.1", "license": "MIT", "author": "dogu", "homepage": "https://github.com/dogu-team/gamium.git", + "type": "commonjs", + "exports": { + ".": { + "require": { + "types": "./build/cjs/index.d.ts", + "default": "./build/cjs/index.cjs" + }, + "import": { + "types": "./build/esm/index.d.ts", + "default": "./build/esm/index.mjs" + } + }, + "./common": { + "require": { + "types": "./build/cjs/common/index.d.ts", + "default": "./build/cjs/common/index.cjs" + }, + "import": { + "types": "./build/esm/common/index.d.ts", + "default": "./build/esm/common/index.mjs" + } + } + }, + "main": "./build/cjs/index.cjs", "files": [ "build" ], @@ -14,6 +38,7 @@ "rebuild": "yarn run clean && yarn run build", "watch": "clear; echo gamium Watching... && nodemon" }, + "types": "./build/cjs/index.d.ts", "dependencies": { "flatbuffers": "22.10.26", "gl-matrix": "3.4.3" @@ -35,30 +60,5 @@ }, "publishConfig": { "access": "public" - }, - "type": "commonjs", - "exports": { - ".": { - "require": { - "types": "./build/cjs/index.d.ts", - "default": "./build/cjs/index.cjs" - }, - "import": { - "types": "./build/esm/index.d.ts", - "default": "./build/esm/index.mjs" - } - }, - "./common": { - "require": { - "types": "./build/cjs/common/index.d.ts", - "default": "./build/cjs/common/index.cjs" - }, - "import": { - "types": "./build/esm/common/index.d.ts", - "default": "./build/esm/common/index.mjs" - } - } - }, - "types": "./build/cjs/index.d.ts", - "main": "./build/cjs/index.cjs" + } } diff --git a/client/typescript/gamium/src/common/actions/key-by.ts b/client/typescript/gamium/src/common/actions/key-by.ts index 0b7c90d0..cca99764 100644 --- a/client/typescript/gamium/src/common/actions/key-by.ts +++ b/client/typescript/gamium/src/common/actions/key-by.ts @@ -1,8 +1,4 @@ -import { - InputKeyBy, - UnityKeyboard, - UnityKeyCode, -} from "../protocols/generated"; +import { InputKeyBy, UnityKeyboard, UnityKeyCode } from '../protocols/generated'; export class KeyBy { constructor(public readonly by: InputKeyBy, public readonly str: string) {} @@ -10,7 +6,7 @@ export class KeyBy { return new KeyBy(InputKeyBy.UNITY_KEYCODE, code); } static unityKeyboard(key: keyof typeof UnityKeyboard): KeyBy { - const casted = key.replace("Digit", ""); + const casted = key.replace('Digit', ''); return new KeyBy(InputKeyBy.UNITY_KEYBOARD, casted); } } diff --git a/client/typescript/gamium/src/common/errors/gamium-error.ts b/client/typescript/gamium/src/common/errors/gamium-error.ts index acea787b..a027d8dc 100644 --- a/client/typescript/gamium/src/common/errors/gamium-error.ts +++ b/client/typescript/gamium/src/common/errors/gamium-error.ts @@ -1,13 +1,8 @@ -import { stringify } from "../internal/functions"; -import { ErrorCode } from "../protocols/generated"; +import { stringify } from '../internal/functions'; +import { ErrorCode } from '../protocols/generated'; export class GamiumError extends Error { - constructor( - public readonly code: ErrorCode, - public readonly reason: string, - private readonly etc?: { [key: string]: unknown }, - options?: ErrorOptions - ) { + constructor(public readonly code: ErrorCode, public readonly reason: string, private readonly etc?: { [key: string]: unknown }, options?: ErrorOptions) { const reasonObj = { code: ErrorCode[code], reason, etc }; super(stringify(reasonObj, { depth: undefined }), options); } diff --git a/client/typescript/gamium/src/common/errors/gamium-wait-error.ts b/client/typescript/gamium/src/common/errors/gamium-wait-error.ts index 144bf196..7826ffdc 100644 --- a/client/typescript/gamium/src/common/errors/gamium-wait-error.ts +++ b/client/typescript/gamium/src/common/errors/gamium-wait-error.ts @@ -1,6 +1,6 @@ -import { ErrorCode } from "../protocols/generated"; -import { WaitOptions } from "../options/wait-options"; -import { GamiumError } from "./gamium-error"; +import { WaitOptions } from '../options/wait-options'; +import { ErrorCode } from '../protocols/generated'; +import { GamiumError } from './gamium-error'; export class GamiumWaitError extends GamiumError { constructor( @@ -9,7 +9,7 @@ export class GamiumWaitError extends GamiumError { public innerResult?: unknown, public tryCount?: number, public waitOptions?: Partial, - options?: ErrorOptions + options?: ErrorOptions, ) { super(code, reason, { innerResult, tryCount, waitOptions }, options); } diff --git a/client/typescript/gamium/src/common/gamium-service.ts b/client/typescript/gamium/src/common/gamium-service.ts index 33c0e36e..ebaf12b0 100644 --- a/client/typescript/gamium/src/common/gamium-service.ts +++ b/client/typescript/gamium/src/common/gamium-service.ts @@ -7,6 +7,8 @@ import { ExecuteRpcResultT, FindObjectsParamT, FindObjectsResultT, + GetPageSourceParamT, + GetPageSourceResultT, HelloParamT, HelloResultT, InspectObjectOnScreenParamT, @@ -123,6 +125,15 @@ export const createInspectWithIdScreen = (param: Plain): PacketTypes => { + return { + param: new GetPageSourceParamT(), + result: undefined, + paramEnum: Param.Packets_GetPageSourceParam, + resultEnum: Result.Packets_GetPageSourceResult, + }; +}; + export const createQueryProfile = (param: Plain): PacketTypes => { return { param: new QueryProfileParamT(), diff --git a/client/typescript/gamium/src/common/index.ts b/client/typescript/gamium/src/common/index.ts index 666c6832..b4af378f 100644 --- a/client/typescript/gamium/src/common/index.ts +++ b/client/typescript/gamium/src/common/index.ts @@ -1,34 +1,34 @@ -export * as GamiumProtocol from "./protocols/generated"; -export * from "./actions/action-chain"; -export * from "./actions/key-by"; -export * from "./condition"; -export * from "./errors/gamium-error"; -export * from "./errors/gamium-wait-error"; -export * from "./gamium-client"; -export * from "./gamium-service"; -export * from "./inspect/inspector"; -export * from "./locator/by"; -export * from "./locator/locator"; -export * from "./locator/rpc-by"; -export * from "./locator/rpc-locator"; -export * from "./object/player"; -export * from "./object/ui-element"; -export * from "./options/actions-click-options"; -export * from "./options/actions-drag-options"; -export * from "./options/actions-move-options"; -export * from "./options/actions-scroll-options"; -export * from "./options/execute-rpc-options"; -export * from "./options/find-object-options"; -export * from "./options/gamium-client-options"; -export * from "./options/move-player-options"; -export * from "./options/query-object-interactable-options"; -export * from "./options/send-key-options"; -export * from "./options/set-text-options"; -export * from "./options/wait-options"; -export * from "./protocols/functions"; -export * from "./protocols/types"; -export * from "./types"; -export * from "./ui/ui"; -export * from "./until"; -export * from "./version"; -export * from "./wait-condition"; +export * from './actions/action-chain'; +export * from './actions/key-by'; +export * from './condition'; +export * from './errors/gamium-error'; +export * from './errors/gamium-wait-error'; +export * from './gamium-client'; +export * from './gamium-service'; +export * from './inspect/inspector'; +export * from './locator/by'; +export * from './locator/locator'; +export * from './locator/rpc-by'; +export * from './locator/rpc-locator'; +export * from './object/player'; +export * from './object/ui-element'; +export * from './options/actions-click-options'; +export * from './options/actions-drag-options'; +export * from './options/actions-move-options'; +export * from './options/actions-scroll-options'; +export * from './options/execute-rpc-options'; +export * from './options/find-object-options'; +export * from './options/gamium-client-options'; +export * from './options/move-player-options'; +export * from './options/query-object-interactable-options'; +export * from './options/send-key-options'; +export * from './options/set-text-options'; +export * from './options/wait-options'; +export * from './protocols/functions'; +export * as GamiumProtocol from './protocols/generated'; +export * from './protocols/types'; +export * from './types'; +export * from './ui/ui'; +export * from './until'; +export * from './version'; +export * from './wait-condition'; diff --git a/client/typescript/gamium/src/common/inspect/inspector.ts b/client/typescript/gamium/src/common/inspect/inspector.ts index 85a89479..a388fb8d 100644 --- a/client/typescript/gamium/src/common/inspect/inspector.ts +++ b/client/typescript/gamium/src/common/inspect/inspector.ts @@ -1,37 +1,21 @@ -import { ErrorCode, Vector2T } from "../protocols/generated"; -import { GamiumError } from "../errors/gamium-error"; -import { GamiumClient } from "../gamium-client"; -import { - createDumpObjectsHierarchy, - createInspectObjectOnScreen, - createInspectWithIdScreen, - GamiumService, -} from "../gamium-service"; -import { Plainify } from "../protocols/functions"; -import { - InspectObjectOnScreenResult, - ObjectInfo, - ObjectsHierarchy, - Vector2, -} from "../protocols/types"; -import { stringify } from "../internal/functions"; +import { GamiumError } from '../errors/gamium-error'; +import { GamiumClient } from '../gamium-client'; +import { createDumpObjectsHierarchy, createGetPageSource, createInspectObjectOnScreen, createInspectWithIdScreen, GamiumService } from '../gamium-service'; +import { stringify } from '../internal/functions'; +import { Plainify } from '../protocols/functions'; +import { ErrorCode, Vector2T } from '../protocols/generated'; +import { InspectObjectOnScreenResult, ObjectInfo, ObjectsHierarchy, Vector2 } from '../protocols/types'; export class Inspector { - constructor( - protected readonly gamium: GamiumClient, - protected readonly gamiumService: GamiumService - ) {} + constructor(protected readonly gamium: GamiumClient, protected readonly gamiumService: GamiumService) {} - async inspectOnPos( - pos: Vector2, - screenSize: Vector2 - ): Promise { + async inspectOnPos(pos: Vector2, screenSize: Vector2): Promise { this.gamium.logger.debug?.(`Inspector.insepctOnPos pos:${stringify(pos)}`); const result = await this.gamiumService.request( createInspectObjectOnScreen({ pos: new Vector2T(pos.x, pos.y), screenSize: new Vector2T(screenSize.x, screenSize.y), - }) + }), ); const { infos, hitPoint } = result; return { @@ -42,30 +26,22 @@ export class Inspector { async inspect(objectId: string): Promise { this.gamium.logger.debug?.(`Inspector.insepct:${objectId}`); - const res = await this.gamiumService.request( - createInspectWithIdScreen({ objectId: objectId }) - ); + const res = await this.gamiumService.request(createInspectWithIdScreen({ objectId: objectId })); if (!res.info) { - throw new GamiumError( - ErrorCode.ObjectNotFound, - `inspect.inspect str:${objectId} not found` - ); + throw new GamiumError(ErrorCode.ObjectNotFound, `inspect.inspect str:${objectId} not found`); } return Plainify.objectInfo(res.info); } - async dumpHierarchy( - objectId: string, - depth: number - ): Promise { - this.gamium.logger.debug?.( - `Inspector.dumpHierarchy objectId:${objectId}, depth:${stringify(depth)}` - ); - const res = await this.gamiumService.request( - createDumpObjectsHierarchy({ objectId: objectId, depth: depth }) - ); - return res.hierarchies.map((hierarchy) => - Plainify.objectsHierarchy(hierarchy) - ); + async dumpHierarchy(objectId: string, depth: number): Promise { + this.gamium.logger.debug?.(`Inspector.dumpHierarchy objectId:${objectId}, depth:${stringify(depth)}`); + const res = await this.gamiumService.request(createDumpObjectsHierarchy({ objectId: objectId, depth: depth })); + return res.hierarchies.map((hierarchy) => Plainify.objectsHierarchy(hierarchy)); + } + + async getPageSource(): Promise { + this.gamium.logger.debug?.(`Inspector.getPageSource`); + const res = await this.gamiumService.request(createGetPageSource({})); + return Plainify.string(res.pageSource); } } diff --git a/client/typescript/gamium/src/common/internal/functions.ts b/client/typescript/gamium/src/common/internal/functions.ts index 501b75b7..7da0cac8 100644 --- a/client/typescript/gamium/src/common/internal/functions.ts +++ b/client/typescript/gamium/src/common/internal/functions.ts @@ -1,4 +1,4 @@ -import { stringifier, StringifyOptions } from "./stringifier"; +import { stringifier, StringifyOptions } from './stringifier'; export async function delay(milliseconds: number): Promise { return new Promise((resolve) => setTimeout(resolve, milliseconds)); @@ -14,13 +14,10 @@ export function stringifyError(value: unknown): string { export function stringifyAllProps(value: unknown): string { if (null == value) { - return "null"; + return 'null'; } if (undefined == value) { - return "undefined"; + return 'undefined'; } - return JSON.stringify(value, Object.getOwnPropertyNames(value), 2).replaceAll( - "\\n", - "\n" - ); + return JSON.stringify(value, Object.getOwnPropertyNames(value), 2).replaceAll('\\n', '\n'); } diff --git a/client/typescript/gamium/src/common/internal/logs.ts b/client/typescript/gamium/src/common/internal/logs.ts index 92af8921..0b03c32a 100644 --- a/client/typescript/gamium/src/common/internal/logs.ts +++ b/client/typescript/gamium/src/common/internal/logs.ts @@ -1,7 +1,4 @@ -export type LeveledLogMethod = ( - message: unknown, - details?: Record -) => void; +export type LeveledLogMethod = (message: unknown, details?: Record) => void; export interface Printable { error: LeveledLogMethod; diff --git a/client/typescript/gamium/src/common/internal/stringifier.ts b/client/typescript/gamium/src/common/internal/stringifier.ts index c2dc5701..043989fa 100644 --- a/client/typescript/gamium/src/common/internal/stringifier.ts +++ b/client/typescript/gamium/src/common/internal/stringifier.ts @@ -1,9 +1,9 @@ /** * @note henry: for browser and node.js compatibility */ -import { stringifyAllProps } from "./functions"; +import { stringifyAllProps } from './functions'; -import util from "util"; +import util from 'util'; /** * @reference nodejs util.inspect @@ -62,7 +62,7 @@ export interface StringifyOptions { /** * @default false */ - getters?: "get" | "set" | boolean; + getters?: 'get' | 'set' | boolean; /** * @default false @@ -89,9 +89,7 @@ function defaultStringifyOptions(): FilledStringifyOptions { }; } -function fillStringifyOptions( - options?: StringifyOptions -): FilledStringifyOptions { +function fillStringifyOptions(options?: StringifyOptions): FilledStringifyOptions { return { ...defaultStringifyOptions(), ...options }; } @@ -107,18 +105,18 @@ class NodeStringifier implements Stringifier { constructor() { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires this.util = util; - if (typeof this.util !== "object") { - throw new Error("Cannot load util"); + if (typeof this.util !== 'object') { + throw new Error('Cannot load util'); } // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access this.inspect = this.util.inspect; - if (typeof this.inspect !== "function") { - throw new Error("Cannot load util.inspect"); + if (typeof this.inspect !== 'function') { + throw new Error('Cannot load util.inspect'); } } stringify(value: unknown, options?: StringifyOptions): string { - if (typeof value === "object") { + if (typeof value === 'object') { try { const filledOptions = fillStringifyOptions(options); // eslint-disable-next-line @typescript-eslint/no-unsafe-return @@ -134,7 +132,7 @@ class NodeStringifier implements Stringifier { class BrowserStringifier implements Stringifier { stringify(value: unknown, options?: StringifyOptions): string { - if (typeof value === "object") { + if (typeof value === 'object') { return stringifyAllProps(value); } else { return String(value); @@ -142,7 +140,4 @@ class BrowserStringifier implements Stringifier { } } -export const stringifier = - typeof process === "object" - ? new NodeStringifier() - : new BrowserStringifier(); +export const stringifier = typeof process === 'object' ? new NodeStringifier() : new BrowserStringifier(); diff --git a/client/typescript/gamium/src/common/internal/utils/errors.ts b/client/typescript/gamium/src/common/internal/utils/errors.ts index f6dfeb57..1d7f0229 100644 --- a/client/typescript/gamium/src/common/internal/utils/errors.ts +++ b/client/typescript/gamium/src/common/internal/utils/errors.ts @@ -1,3 +1,3 @@ -import { ErrorCode, ErrorResultT } from "../../protocols/generated"; +import { ErrorCode, ErrorResultT } from '../../protocols/generated'; export const ErrorNone = new ErrorResultT(ErrorCode.None); diff --git a/client/typescript/gamium/src/common/internal/utils/wait.ts b/client/typescript/gamium/src/common/internal/utils/wait.ts index b29edfa8..78b03e41 100644 --- a/client/typescript/gamium/src/common/internal/utils/wait.ts +++ b/client/typescript/gamium/src/common/internal/utils/wait.ts @@ -1,27 +1,25 @@ -import { ErrorCode } from "../../protocols/generated"; -import { GamiumWaitError } from "../../errors/gamium-wait-error"; -import { GamiumClient } from "../../gamium-client"; -import { DefaultWaitOptions, WaitOptions } from "../../options/wait-options"; -import { WaitCondition } from "../../wait-condition"; -import { delay } from "../functions"; +import { GamiumWaitError } from '../../errors/gamium-wait-error'; +import { GamiumClient } from '../../gamium-client'; +import { DefaultWaitOptions, WaitOptions } from '../../options/wait-options'; +import { ErrorCode } from '../../protocols/generated'; +import { WaitCondition } from '../../wait-condition'; +import { delay } from '../functions'; export const waitGeneric = async ( GamiumClient: GamiumClient, condition: WaitCondition, - option: Partial = DefaultWaitOptions() + option: Partial = DefaultWaitOptions(), ): Promise => { const optionMixed: WaitOptions = { ...DefaultWaitOptions(), ...option }; - const callCondition: (cond: typeof condition) => Promise = async ( - condition - ) => { - if ("then" in condition) { + const callCondition: (cond: typeof condition) => Promise = async (condition) => { + if ('then' in condition) { return await condition; } - if ("message" in condition && "contidionFunc" in condition) { + if ('message' in condition && 'contidionFunc' in condition) { return await condition.contidionFunc(GamiumClient); } const conditionRet = condition(GamiumClient); - if ("then" in conditionRet) { + if ('then' in conditionRet) { return await conditionRet; } return conditionRet; @@ -30,7 +28,7 @@ export const waitGeneric = async ( let lastCallTime = Date.now(); let i = 0; - const error = new GamiumWaitError(ErrorCode.Timeout, "wait timeout"); + const error = new GamiumWaitError(ErrorCode.Timeout, 'wait timeout'); error.waitOptions = optionMixed; for (i = 0; i < Infinity; i++) { @@ -51,8 +49,7 @@ export const waitGeneric = async ( break; } } - const remainIntervalMs = - optionMixed.intervalMs - (Date.now() - lastCallTime); + const remainIntervalMs = optionMixed.intervalMs - (Date.now() - lastCallTime); if (1 < remainIntervalMs) { await delay(remainIntervalMs - 1); } diff --git a/client/typescript/gamium/src/common/locator/by.ts b/client/typescript/gamium/src/common/locator/by.ts index b893e917..ba4c5ab1 100644 --- a/client/typescript/gamium/src/common/locator/by.ts +++ b/client/typescript/gamium/src/common/locator/by.ts @@ -1,10 +1,7 @@ -import { ObjectLocatorBy } from "../protocols/generated"; +import { ObjectLocatorBy } from '../protocols/generated'; export class By { - constructor( - public readonly by: ObjectLocatorBy, - public readonly str: string - ) {} + constructor(public readonly by: ObjectLocatorBy, public readonly str: string) {} static path(str: string): By { return new By(ObjectLocatorBy.Path, str); } diff --git a/client/typescript/gamium/src/common/locator/rpc-by.ts b/client/typescript/gamium/src/common/locator/rpc-by.ts index 6da8a69e..780ab143 100644 --- a/client/typescript/gamium/src/common/locator/rpc-by.ts +++ b/client/typescript/gamium/src/common/locator/rpc-by.ts @@ -1,17 +1,8 @@ -import { ExecuteRpcBy } from "../protocols/generated"; +import { ExecuteRpcBy } from '../protocols/generated'; export class RpcBy { - constructor( - public readonly by: ExecuteRpcBy, - public readonly className: string, - public readonly targetName: string, - public readonly params: unknown[] - ) {} - static method( - classPath: string, - methodName: string, - ...params: unknown[] - ): RpcBy { + constructor(public readonly by: ExecuteRpcBy, public readonly className: string, public readonly targetName: string, public readonly params: unknown[]) {} + static method(classPath: string, methodName: string, ...params: unknown[]): RpcBy { return new RpcBy(ExecuteRpcBy.Method, classPath, methodName, params ?? []); } static field(classPath: string, fieldName: string): RpcBy { diff --git a/client/typescript/gamium/src/common/object/player.ts b/client/typescript/gamium/src/common/object/player.ts index c1ba3013..4c93bc38 100644 --- a/client/typescript/gamium/src/common/object/player.ts +++ b/client/typescript/gamium/src/common/object/player.ts @@ -1,33 +1,18 @@ -import * as gl from "gl-matrix"; -import { GamiumClient } from "../gamium-client"; -import { GamiumService } from "../gamium-service"; -import { By } from "../locator/by"; -import { isLocator, Locator } from "../locator/locator"; -import { - DefaultMovePlayerOptions, - MovePlayerOptions, -} from "../options/move-player-options"; -import { refreshObjectInfo, Zero } from "../protocols/functions"; -import { ObjectInfo, Vector3 } from "../protocols/types"; -import { stringifyAllProps } from "../internal/functions"; +import * as gl from 'gl-matrix'; +import { GamiumClient } from '../gamium-client'; +import { GamiumService } from '../gamium-service'; +import { stringifyAllProps } from '../internal/functions'; +import { By } from '../locator/by'; +import { isLocator, Locator } from '../locator/locator'; +import { DefaultMovePlayerOptions, MovePlayerOptions } from '../options/move-player-options'; +import { refreshObjectInfo, Zero } from '../protocols/functions'; +import { ObjectInfo, Vector3 } from '../protocols/types'; export class Player { - constructor( - protected readonly game: GamiumClient, - protected readonly gamiumService: GamiumService, - public info: ObjectInfo - ) {} + constructor(protected readonly game: GamiumClient, protected readonly gamiumService: GamiumService, public info: ObjectInfo) {} - async move( - cameraLocator: Locator, - dest: Vector3 | Locator, - options: Partial = DefaultMovePlayerOptions() - ): Promise { - this.game.logger.info( - `Player(${this.info.path.toString()}).move dest:${stringifyAllProps( - dest - )}` - ); + async move(cameraLocator: Locator, dest: Vector3 | Locator, options: Partial = DefaultMovePlayerOptions()): Promise { + this.game.logger.info(`Player(${this.info.path.toString()}).move dest:${stringifyAllProps(dest)}`); let destPos = Zero.vector3(); if (isLocator(dest)) { const destObjectInfo = await this.game.find(dest); @@ -35,28 +20,15 @@ export class Player { } else { destPos = dest; } - await this.game - .actions() - .movePlayer(By.path(this.info.path), cameraLocator, destPos, options) - .perform(); + await this.game.actions().movePlayer(By.path(this.info.path), cameraLocator, destPos, options).perform(); } - async isNear( - otherLocator: Locator, - option: { epsilon: number } = { epsilon: 10 } - ): Promise { - this.game.logger.info( - `Player(${this.info.path.toString()}).isNear other:${stringifyAllProps( - otherLocator - )}` - ); + async isNear(otherLocator: Locator, option: { epsilon: number } = { epsilon: 10 }): Promise { + this.game.logger.info(`Player(${this.info.path.toString()}).isNear other:${stringifyAllProps(otherLocator)}`); await this.refresh(); const thisPosition = this.info.position; const otherPosition = (await this.game.find(otherLocator)).position; - const dist = gl.vec3.dist( - [thisPosition.x, thisPosition.y, thisPosition.z], - [otherPosition.x, otherPosition.y, otherPosition.z] - ); + const dist = gl.vec3.dist([thisPosition.x, thisPosition.y, thisPosition.z], [otherPosition.x, otherPosition.y, otherPosition.z]); if (dist < option.epsilon) { return true; } diff --git a/client/typescript/gamium/src/common/object/ui-element.ts b/client/typescript/gamium/src/common/object/ui-element.ts index 6989de4e..5f6a29e7 100644 --- a/client/typescript/gamium/src/common/object/ui-element.ts +++ b/client/typescript/gamium/src/common/object/ui-element.ts @@ -1,94 +1,48 @@ -import { Vector2T, Vector3T } from "../protocols/generated"; -import { GamiumClient } from "../gamium-client"; -import { - createQueryObjectInteractable, - GamiumService, -} from "../gamium-service"; -import { By } from "../locator/by"; -import { - ActionsClickOptions, - DefaultActionClickOptions, -} from "../options/actions-click-options"; -import { - ActionsDragOptions, - DefaultActionsDragOptions, -} from "../options/actions-drag-options"; -import { - ActionsScrollOptions, - DefaultActionScrollOptions, -} from "../options/actions-scroll-options"; -import { - DefaultQueryObjectInteractableOptions, - QueryObjectInteractableOptions, -} from "../options/query-object-interactable-options"; -import { DefaultSetTextOptions } from "../options/set-text-options"; -import { refreshObjectInfo, Zero } from "../protocols/functions"; -import { ObjectInfo, Vector2 } from "../protocols/types"; -import { tryify, TryResult } from "../try"; -import { Until } from "../until"; +import { GamiumClient } from '../gamium-client'; +import { createQueryObjectInteractable, GamiumService } from '../gamium-service'; +import { By } from '../locator/by'; +import { ActionsClickOptions, DefaultActionClickOptions } from '../options/actions-click-options'; +import { ActionsDragOptions, DefaultActionsDragOptions } from '../options/actions-drag-options'; +import { ActionsScrollOptions, DefaultActionScrollOptions } from '../options/actions-scroll-options'; +import { DefaultQueryObjectInteractableOptions, QueryObjectInteractableOptions } from '../options/query-object-interactable-options'; +import { DefaultSetTextOptions } from '../options/set-text-options'; +import { refreshObjectInfo, Zero } from '../protocols/functions'; +import { Vector2T, Vector3T } from '../protocols/generated'; +import { ObjectInfo, Vector2 } from '../protocols/types'; +import { tryify, TryResult } from '../try'; +import { Until } from '../until'; export class UIElement { - constructor( - protected readonly game: GamiumClient, - protected readonly gamiumService: GamiumService, - public info: ObjectInfo - ) {} + constructor(protected readonly game: GamiumClient, protected readonly gamiumService: GamiumService, public info: ObjectInfo) {} - async click( - options: Partial = DefaultActionClickOptions() - ): Promise { + async click(options: Partial = DefaultActionClickOptions()): Promise { this.game.logger.info(`UIElement(${this.info.path.toString()}).click`); await this.refresh(); - await this.game - .actions() - .click(this.info.screenPosition, options) - .perform(); + await this.game.actions().click(this.info.screenPosition, options).perform(); } - async drag( - to: UIElement | Vector2, - options: Partial = DefaultActionsDragOptions() - ): Promise { + async drag(to: UIElement | Vector2, options: Partial = DefaultActionsDragOptions()): Promise { this.game.logger.info(`UIElement(${this.info.path.toString()}).drag`); - const toPos = - to instanceof UIElement - ? to.info.screenPosition - : new Vector3T(to.x, to.y, 0); + const toPos = to instanceof UIElement ? to.info.screenPosition : new Vector3T(to.x, to.y, 0); await this.refresh(); - await this.game - .actions() - .drag(this.info.screenPosition, toPos, options) - .perform(); + await this.game.actions().drag(this.info.screenPosition, toPos, options).perform(); } - async scroll( - delta: Vector2, - options: Partial = DefaultActionScrollOptions() - ): Promise { + async scroll(delta: Vector2, options: Partial = DefaultActionScrollOptions()): Promise { this.game.logger.info(`UIElement(${this.info.path.toString()}).scroll`); const optionMixed = { ...DefaultActionScrollOptions(), ...options }; await this.refresh(); await this.game .actions() - .scroll( - this.info.screenPosition, - new Vector2T(delta.x, delta.y), - optionMixed - ) + .scroll(this.info.screenPosition, new Vector2T(delta.x, delta.y), optionMixed) .sleep(optionMixed.durationMs) .scroll(this.info.screenPosition, Zero.vector2(), optionMixed) .perform(); } - async setText( - text: string, - options = DefaultSetTextOptions() - ): Promise { + async setText(text: string, options = DefaultSetTextOptions()): Promise { this.game.logger.info(`UIElement(${this.info.path.toString()}).setText`); - await this.game - .actions() - .setText(By.path(this.info.path), text, options) - .perform(); + await this.game.actions().setText(By.path(this.info.path), text, options).perform(); await this.refresh(); } @@ -97,12 +51,8 @@ export class UIElement { return this.info.text.toString(); } - async isInteractable( - options: Partial = DefaultQueryObjectInteractableOptions() - ): Promise { - this.game.logger.info( - `UIElement(${this.info.path.toString()}).isInteractable` - ); + async isInteractable(options: Partial = DefaultQueryObjectInteractableOptions()): Promise { + this.game.logger.info(`UIElement(${this.info.path.toString()}).isInteractable`); const optionMixed = { ...DefaultQueryObjectInteractableOptions(), ...options, @@ -112,29 +62,21 @@ export class UIElement { objectId: this.info.path, checkMoving: optionMixed.checkMoving, checkRaycast: optionMixed.checkRaycast, - }) + }), ); return res.isInteractable; } - async tryIsInteractable( - options: Partial = DefaultQueryObjectInteractableOptions() - ): Promise> { + async tryIsInteractable(options: Partial = DefaultQueryObjectInteractableOptions()): Promise> { return tryify(this.isInteractable(options)); } - async waitInteractable( - options: Partial = DefaultQueryObjectInteractableOptions() - ): Promise { - this.game.logger.info( - `UIElement(${this.info.path.toString()}).isInteractable` - ); + async waitInteractable(options: Partial = DefaultQueryObjectInteractableOptions()): Promise { + this.game.logger.info(`UIElement(${this.info.path.toString()}).isInteractable`); await this.game.wait(Until.elementInteractable(this, options)); } - async tryWaitInteractable( - options: Partial = DefaultQueryObjectInteractableOptions() - ): Promise> { + async tryWaitInteractable(options: Partial = DefaultQueryObjectInteractableOptions()): Promise> { return tryify(this.waitInteractable(options)); } diff --git a/client/typescript/gamium/src/common/options/move-player-options.ts b/client/typescript/gamium/src/common/options/move-player-options.ts index f818c1f7..47ac308a 100644 --- a/client/typescript/gamium/src/common/options/move-player-options.ts +++ b/client/typescript/gamium/src/common/options/move-player-options.ts @@ -1,4 +1,4 @@ -import { MovePlayerBy } from "../protocols/generated"; +import { MovePlayerBy } from '../protocols/generated'; export interface MovePlayerOptions { by: MovePlayerBy; diff --git a/client/typescript/gamium/src/common/protocols/functions.ts b/client/typescript/gamium/src/common/protocols/functions.ts index 217b6b0d..bdeb8a26 100644 --- a/client/typescript/gamium/src/common/protocols/functions.ts +++ b/client/typescript/gamium/src/common/protocols/functions.ts @@ -1,26 +1,9 @@ -import { - ObjectHierarchyNodeT, - ObjectInfoT, - ObjectsHierarchyT, - Vector2T, - Vector3T, - Vector4T, -} from "./generated"; -import { GamiumClient } from "../gamium-client"; -import { By } from "../locator/by"; -import { - ObjectHierarchyNode, - ObjectInfo, - ObjectsHierarchy, - Vector2, - Vector3, - Vector4, -} from "./types"; +import { GamiumClient } from '../gamium-client'; +import { By } from '../locator/by'; +import { ObjectHierarchyNodeT, ObjectInfoT, ObjectsHierarchyT, Vector2T, Vector3T, Vector4T } from './generated'; +import { ObjectHierarchyNode, ObjectInfo, ObjectsHierarchy, Vector2, Vector3, Vector4 } from './types'; -export async function refreshObjectInfo( - game: GamiumClient, - info: ObjectInfo -): Promise { +export async function refreshObjectInfo(game: GamiumClient, info: ObjectInfo): Promise { return await game.find(By.path(info.path.toString())); } @@ -40,7 +23,7 @@ export class Zero { export class Plainify { static string(value: string | Uint8Array | null): string { - return typeof value === "string" ? value : value?.toString() ?? ""; + return typeof value === 'string' ? value : value?.toString() ?? ''; } static vector2(value: Vector2T | null): Vector2 { @@ -59,16 +42,7 @@ export class Plainify { } static objectInfo(value: ObjectInfoT): ObjectInfo { - const { - path, - name, - text, - screenPosition, - screenRectSize, - position, - rotation, - ...rest - } = value; + const { path, name, text, screenPosition, screenRectSize, position, rotation, ...rest } = value; return { path: Plainify.string(path), name: Plainify.string(name), diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-param.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-param.ts new file mode 100644 index 00000000..8abdde56 --- /dev/null +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-param.ts @@ -0,0 +1,50 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +import * as flatbuffers from 'flatbuffers'; + +export class GetPageSourceParam implements flatbuffers.IUnpackableObject { + bb: flatbuffers.ByteBuffer | null = null; + bb_pos = 0; + __init(i: number, bb: flatbuffers.ByteBuffer): GetPageSourceParam { + this.bb_pos = i; + this.bb = bb; + return this; + } + + static getRootAsGetPageSourceParam(bb: flatbuffers.ByteBuffer, obj?: GetPageSourceParam): GetPageSourceParam { + return (obj || new GetPageSourceParam()).__init(bb.readInt32(bb.position()) + bb.position(), bb); + } + + static getSizePrefixedRootAsGetPageSourceParam(bb: flatbuffers.ByteBuffer, obj?: GetPageSourceParam): GetPageSourceParam { + bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH); + return (obj || new GetPageSourceParam()).__init(bb.readInt32(bb.position()) + bb.position(), bb); + } + + static startGetPageSourceParam(builder: flatbuffers.Builder) { + builder.startObject(0); + } + + static endGetPageSourceParam(builder: flatbuffers.Builder): flatbuffers.Offset { + const offset = builder.endObject(); + return offset; + } + + static createGetPageSourceParam(builder: flatbuffers.Builder): flatbuffers.Offset { + GetPageSourceParam.startGetPageSourceParam(builder); + return GetPageSourceParam.endGetPageSourceParam(builder); + } + + unpack(): GetPageSourceParamT { + return new GetPageSourceParamT(); + } + + unpackTo(_o: GetPageSourceParamT): void {} +} + +export class GetPageSourceParamT implements flatbuffers.IGeneratedObject { + constructor() {} + + pack(builder: flatbuffers.Builder): flatbuffers.Offset { + return GetPageSourceParam.createGetPageSourceParam(builder); + } +} diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-result.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-result.ts new file mode 100644 index 00000000..10d67f3d --- /dev/null +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/get-page-source-result.ts @@ -0,0 +1,66 @@ +// automatically generated by the FlatBuffers compiler, do not modify + +import * as flatbuffers from 'flatbuffers'; + +export class GetPageSourceResult implements flatbuffers.IUnpackableObject { + bb: flatbuffers.ByteBuffer | null = null; + bb_pos = 0; + __init(i: number, bb: flatbuffers.ByteBuffer): GetPageSourceResult { + this.bb_pos = i; + this.bb = bb; + return this; + } + + static getRootAsGetPageSourceResult(bb: flatbuffers.ByteBuffer, obj?: GetPageSourceResult): GetPageSourceResult { + return (obj || new GetPageSourceResult()).__init(bb.readInt32(bb.position()) + bb.position(), bb); + } + + static getSizePrefixedRootAsGetPageSourceResult(bb: flatbuffers.ByteBuffer, obj?: GetPageSourceResult): GetPageSourceResult { + bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH); + return (obj || new GetPageSourceResult()).__init(bb.readInt32(bb.position()) + bb.position(), bb); + } + + pageSource(): string | null; + pageSource(optionalEncoding: flatbuffers.Encoding): string | Uint8Array | null; + pageSource(optionalEncoding?: any): string | Uint8Array | null { + const offset = this.bb!.__offset(this.bb_pos, 4); + return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null; + } + + static startGetPageSourceResult(builder: flatbuffers.Builder) { + builder.startObject(1); + } + + static addPageSource(builder: flatbuffers.Builder, pageSourceOffset: flatbuffers.Offset) { + builder.addFieldOffset(0, pageSourceOffset, 0); + } + + static endGetPageSourceResult(builder: flatbuffers.Builder): flatbuffers.Offset { + const offset = builder.endObject(); + return offset; + } + + static createGetPageSourceResult(builder: flatbuffers.Builder, pageSourceOffset: flatbuffers.Offset): flatbuffers.Offset { + GetPageSourceResult.startGetPageSourceResult(builder); + GetPageSourceResult.addPageSource(builder, pageSourceOffset); + return GetPageSourceResult.endGetPageSourceResult(builder); + } + + unpack(): GetPageSourceResultT { + return new GetPageSourceResultT(this.pageSource()); + } + + unpackTo(_o: GetPageSourceResultT): void { + _o.pageSource = this.pageSource(); + } +} + +export class GetPageSourceResultT implements flatbuffers.IGeneratedObject { + constructor(public pageSource: string | Uint8Array | null = null) {} + + pack(builder: flatbuffers.Builder): flatbuffers.Offset { + const pageSource = this.pageSource !== null ? builder.createString(this.pageSource!) : 0; + + return GetPageSourceResult.createGetPageSourceResult(builder, pageSource); + } +} diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/index.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/index.ts index bb1760fd..a26cdb3d 100644 --- a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/index.ts +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/packets/index.ts @@ -1,5 +1,5 @@ -export * from './action-param-single'; export * from './action-param'; +export * from './action-param-single'; export * from './action-result'; export * from './actions'; export * from './actions-param'; @@ -13,6 +13,8 @@ export * from './execute-rpc-param'; export * from './execute-rpc-result'; export * from './find-objects-param'; export * from './find-objects-result'; +export * from './get-page-source-param'; +export * from './get-page-source-result'; export * from './hello-param'; export * from './hello-result'; export * from './inspect-object-on-screen-param'; diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/param.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/param.ts index c069e87d..8fc21d57 100644 --- a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/param.ts +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/param.ts @@ -1,16 +1,17 @@ // automatically generated by the FlatBuffers compiler, do not modify -import { ActionsParam, ActionsParamT } from '../../gamium/protocol/packets/actions-param.js'; -import { ChangeConfigurationParam, ChangeConfigurationParamT } from '../../gamium/protocol/packets/change-configuration-param.js'; -import { DumpObjectsHierarchyParam, DumpObjectsHierarchyParamT } from '../../gamium/protocol/packets/dump-objects-hierarchy-param.js'; -import { ExecuteRpcParam, ExecuteRpcParamT } from '../../gamium/protocol/packets/execute-rpc-param.js'; -import { FindObjectsParam, FindObjectsParamT } from '../../gamium/protocol/packets/find-objects-param.js'; -import { HelloParam, HelloParamT } from '../../gamium/protocol/packets/hello-param.js'; -import { InspectObjectOnScreenParam, InspectObjectOnScreenParamT } from '../../gamium/protocol/packets/inspect-object-on-screen-param.js'; -import { InspectObjectWithIdParam, InspectObjectWithIdParamT } from '../../gamium/protocol/packets/inspect-object-with-id-param.js'; -import { QueryObjectInteractableParam, QueryObjectInteractableParamT } from '../../gamium/protocol/packets/query-object-interactable-param.js'; -import { QueryProfileParam, QueryProfileParamT } from '../../gamium/protocol/packets/query-profile-param.js'; -import { QueryScreenParam, QueryScreenParamT } from '../../gamium/protocol/packets/query-screen-param.js'; +import { ActionsParam } from '../../gamium/protocol/packets/actions-param.js'; +import { ChangeConfigurationParam } from '../../gamium/protocol/packets/change-configuration-param.js'; +import { DumpObjectsHierarchyParam } from '../../gamium/protocol/packets/dump-objects-hierarchy-param.js'; +import { ExecuteRpcParam } from '../../gamium/protocol/packets/execute-rpc-param.js'; +import { FindObjectsParam } from '../../gamium/protocol/packets/find-objects-param.js'; +import { GetPageSourceParam } from '../../gamium/protocol/packets/get-page-source-param.js'; +import { HelloParam } from '../../gamium/protocol/packets/hello-param.js'; +import { InspectObjectOnScreenParam } from '../../gamium/protocol/packets/inspect-object-on-screen-param.js'; +import { InspectObjectWithIdParam } from '../../gamium/protocol/packets/inspect-object-with-id-param.js'; +import { QueryObjectInteractableParam } from '../../gamium/protocol/packets/query-object-interactable-param.js'; +import { QueryProfileParam } from '../../gamium/protocol/packets/query-profile-param.js'; +import { QueryScreenParam } from '../../gamium/protocol/packets/query-screen-param.js'; export enum Param { NONE = 0, @@ -25,6 +26,7 @@ export enum Param { Packets_DumpObjectsHierarchyParam = 9, Packets_ChangeConfigurationParam = 10, Packets_QueryProfileParam = 11, + Packets_GetPageSourceParam = 12, } export function unionToParam( @@ -36,6 +38,7 @@ export function unionToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -48,6 +51,7 @@ export function unionToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -61,6 +65,7 @@ export function unionToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -93,6 +98,8 @@ export function unionToParam( return accessor(new ChangeConfigurationParam())! as ChangeConfigurationParam; case 'Packets_QueryProfileParam': return accessor(new QueryProfileParam())! as QueryProfileParam; + case 'Packets_GetPageSourceParam': + return accessor(new GetPageSourceParam())! as GetPageSourceParam; default: return null; } @@ -108,6 +115,7 @@ export function unionListToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -120,6 +128,7 @@ export function unionListToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -134,6 +143,7 @@ export function unionListToParam( | DumpObjectsHierarchyParam | ExecuteRpcParam | FindObjectsParam + | GetPageSourceParam | HelloParam | InspectObjectOnScreenParam | InspectObjectWithIdParam @@ -166,6 +176,8 @@ export function unionListToParam( return accessor(index, new ChangeConfigurationParam())! as ChangeConfigurationParam; case 'Packets_QueryProfileParam': return accessor(index, new QueryProfileParam())! as QueryProfileParam; + case 'Packets_GetPageSourceParam': + return accessor(index, new GetPageSourceParam())! as GetPageSourceParam; default: return null; } diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/request.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/request.ts index 995ac634..04a4184d 100644 --- a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/request.ts +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/request.ts @@ -2,18 +2,19 @@ import * as flatbuffers from 'flatbuffers'; -import { ActionsParam, ActionsParamT } from '../../gamium/protocol/packets/actions-param.js'; -import { ChangeConfigurationParam, ChangeConfigurationParamT } from '../../gamium/protocol/packets/change-configuration-param.js'; -import { DumpObjectsHierarchyParam, DumpObjectsHierarchyParamT } from '../../gamium/protocol/packets/dump-objects-hierarchy-param.js'; -import { ExecuteRpcParam, ExecuteRpcParamT } from '../../gamium/protocol/packets/execute-rpc-param.js'; -import { FindObjectsParam, FindObjectsParamT } from '../../gamium/protocol/packets/find-objects-param.js'; -import { HelloParam, HelloParamT } from '../../gamium/protocol/packets/hello-param.js'; -import { InspectObjectOnScreenParam, InspectObjectOnScreenParamT } from '../../gamium/protocol/packets/inspect-object-on-screen-param.js'; -import { InspectObjectWithIdParam, InspectObjectWithIdParamT } from '../../gamium/protocol/packets/inspect-object-with-id-param.js'; -import { QueryObjectInteractableParam, QueryObjectInteractableParamT } from '../../gamium/protocol/packets/query-object-interactable-param.js'; -import { QueryProfileParam, QueryProfileParamT } from '../../gamium/protocol/packets/query-profile-param.js'; -import { QueryScreenParam, QueryScreenParamT } from '../../gamium/protocol/packets/query-screen-param.js'; -import { Param, unionToParam, unionListToParam } from '../../gamium/protocol/param.js'; +import { ActionsParamT } from '../../gamium/protocol/packets/actions-param.js'; +import { ChangeConfigurationParamT } from '../../gamium/protocol/packets/change-configuration-param.js'; +import { DumpObjectsHierarchyParamT } from '../../gamium/protocol/packets/dump-objects-hierarchy-param.js'; +import { ExecuteRpcParamT } from '../../gamium/protocol/packets/execute-rpc-param.js'; +import { FindObjectsParamT } from '../../gamium/protocol/packets/find-objects-param.js'; +import { GetPageSourceParamT } from '../../gamium/protocol/packets/get-page-source-param.js'; +import { HelloParamT } from '../../gamium/protocol/packets/hello-param.js'; +import { InspectObjectOnScreenParamT } from '../../gamium/protocol/packets/inspect-object-on-screen-param.js'; +import { InspectObjectWithIdParamT } from '../../gamium/protocol/packets/inspect-object-with-id-param.js'; +import { QueryObjectInteractableParamT } from '../../gamium/protocol/packets/query-object-interactable-param.js'; +import { QueryProfileParamT } from '../../gamium/protocol/packets/query-profile-param.js'; +import { QueryScreenParamT } from '../../gamium/protocol/packets/query-screen-param.js'; +import { Param, unionToParam } from '../../gamium/protocol/param.js'; export class Request implements flatbuffers.IUnpackableObject { bb: flatbuffers.ByteBuffer | null = null; @@ -122,6 +123,7 @@ export class RequestT implements flatbuffers.IGeneratedObject { | DumpObjectsHierarchyParamT | ExecuteRpcParamT | FindObjectsParamT + | GetPageSourceParamT | HelloParamT | InspectObjectOnScreenParamT | InspectObjectWithIdParamT diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/response.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/response.ts index 41a340bf..6acb9de9 100644 --- a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/response.ts +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/response.ts @@ -2,18 +2,19 @@ import * as flatbuffers from 'flatbuffers'; -import { ActionsResult, ActionsResultT } from '../../gamium/protocol/packets/actions-result.js'; -import { ChangeConfigurationResult, ChangeConfigurationResultT } from '../../gamium/protocol/packets/change-configuration-result.js'; -import { DumpObjectsHierarchyResult, DumpObjectsHierarchyResultT } from '../../gamium/protocol/packets/dump-objects-hierarchy-result.js'; -import { ExecuteRpcResult, ExecuteRpcResultT } from '../../gamium/protocol/packets/execute-rpc-result.js'; -import { FindObjectsResult, FindObjectsResultT } from '../../gamium/protocol/packets/find-objects-result.js'; -import { HelloResult, HelloResultT } from '../../gamium/protocol/packets/hello-result.js'; -import { InspectObjectOnScreenResult, InspectObjectOnScreenResultT } from '../../gamium/protocol/packets/inspect-object-on-screen-result.js'; -import { InspectObjectWithIdResult, InspectObjectWithIdResultT } from '../../gamium/protocol/packets/inspect-object-with-id-result.js'; -import { QueryObjectInteractableResult, QueryObjectInteractableResultT } from '../../gamium/protocol/packets/query-object-interactable-result.js'; -import { QueryProfileResult, QueryProfileResultT } from '../../gamium/protocol/packets/query-profile-result.js'; -import { QueryScreenResult, QueryScreenResultT } from '../../gamium/protocol/packets/query-screen-result.js'; -import { Result, unionToResult, unionListToResult } from '../../gamium/protocol/result.js'; +import { ActionsResultT } from '../../gamium/protocol/packets/actions-result.js'; +import { ChangeConfigurationResultT } from '../../gamium/protocol/packets/change-configuration-result.js'; +import { DumpObjectsHierarchyResultT } from '../../gamium/protocol/packets/dump-objects-hierarchy-result.js'; +import { ExecuteRpcResultT } from '../../gamium/protocol/packets/execute-rpc-result.js'; +import { FindObjectsResultT } from '../../gamium/protocol/packets/find-objects-result.js'; +import { GetPageSourceResultT } from '../../gamium/protocol/packets/get-page-source-result.js'; +import { HelloResultT } from '../../gamium/protocol/packets/hello-result.js'; +import { InspectObjectOnScreenResultT } from '../../gamium/protocol/packets/inspect-object-on-screen-result.js'; +import { InspectObjectWithIdResultT } from '../../gamium/protocol/packets/inspect-object-with-id-result.js'; +import { QueryObjectInteractableResultT } from '../../gamium/protocol/packets/query-object-interactable-result.js'; +import { QueryProfileResultT } from '../../gamium/protocol/packets/query-profile-result.js'; +import { QueryScreenResultT } from '../../gamium/protocol/packets/query-screen-result.js'; +import { Result, unionToResult } from '../../gamium/protocol/result.js'; import { ErrorResult, ErrorResultT } from '../../gamium/protocol/types/error-result.js'; export class Response implements flatbuffers.IUnpackableObject { @@ -127,6 +128,7 @@ export class ResponseT implements flatbuffers.IGeneratedObject { | DumpObjectsHierarchyResultT | ExecuteRpcResultT | FindObjectsResultT + | GetPageSourceResultT | HelloResultT | InspectObjectOnScreenResultT | InspectObjectWithIdResultT diff --git a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/result.ts b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/result.ts index 33771def..741b94f6 100644 --- a/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/result.ts +++ b/client/typescript/gamium/src/common/protocols/generated/gamium/protocol/result.ts @@ -1,16 +1,17 @@ // automatically generated by the FlatBuffers compiler, do not modify -import { ActionsResult, ActionsResultT } from '../../gamium/protocol/packets/actions-result.js'; -import { ChangeConfigurationResult, ChangeConfigurationResultT } from '../../gamium/protocol/packets/change-configuration-result.js'; -import { DumpObjectsHierarchyResult, DumpObjectsHierarchyResultT } from '../../gamium/protocol/packets/dump-objects-hierarchy-result.js'; -import { ExecuteRpcResult, ExecuteRpcResultT } from '../../gamium/protocol/packets/execute-rpc-result.js'; -import { FindObjectsResult, FindObjectsResultT } from '../../gamium/protocol/packets/find-objects-result.js'; -import { HelloResult, HelloResultT } from '../../gamium/protocol/packets/hello-result.js'; -import { InspectObjectOnScreenResult, InspectObjectOnScreenResultT } from '../../gamium/protocol/packets/inspect-object-on-screen-result.js'; -import { InspectObjectWithIdResult, InspectObjectWithIdResultT } from '../../gamium/protocol/packets/inspect-object-with-id-result.js'; -import { QueryObjectInteractableResult, QueryObjectInteractableResultT } from '../../gamium/protocol/packets/query-object-interactable-result.js'; -import { QueryProfileResult, QueryProfileResultT } from '../../gamium/protocol/packets/query-profile-result.js'; -import { QueryScreenResult, QueryScreenResultT } from '../../gamium/protocol/packets/query-screen-result.js'; +import { ActionsResult } from '../../gamium/protocol/packets/actions-result.js'; +import { ChangeConfigurationResult } from '../../gamium/protocol/packets/change-configuration-result.js'; +import { DumpObjectsHierarchyResult } from '../../gamium/protocol/packets/dump-objects-hierarchy-result.js'; +import { ExecuteRpcResult } from '../../gamium/protocol/packets/execute-rpc-result.js'; +import { FindObjectsResult } from '../../gamium/protocol/packets/find-objects-result.js'; +import { GetPageSourceResult } from '../../gamium/protocol/packets/get-page-source-result.js'; +import { HelloResult } from '../../gamium/protocol/packets/hello-result.js'; +import { InspectObjectOnScreenResult } from '../../gamium/protocol/packets/inspect-object-on-screen-result.js'; +import { InspectObjectWithIdResult } from '../../gamium/protocol/packets/inspect-object-with-id-result.js'; +import { QueryObjectInteractableResult } from '../../gamium/protocol/packets/query-object-interactable-result.js'; +import { QueryProfileResult } from '../../gamium/protocol/packets/query-profile-result.js'; +import { QueryScreenResult } from '../../gamium/protocol/packets/query-screen-result.js'; export enum Result { NONE = 0, @@ -25,6 +26,7 @@ export enum Result { Packets_DumpObjectsHierarchyResult = 9, Packets_ChangeConfigurationResult = 10, Packets_QueryProfileResult = 11, + Packets_GetPageSourceResult = 12, } export function unionToResult( @@ -36,6 +38,7 @@ export function unionToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -48,6 +51,7 @@ export function unionToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -61,6 +65,7 @@ export function unionToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -93,6 +98,8 @@ export function unionToResult( return accessor(new ChangeConfigurationResult())! as ChangeConfigurationResult; case 'Packets_QueryProfileResult': return accessor(new QueryProfileResult())! as QueryProfileResult; + case 'Packets_GetPageSourceResult': + return accessor(new GetPageSourceResult())! as GetPageSourceResult; default: return null; } @@ -108,6 +115,7 @@ export function unionListToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -120,6 +128,7 @@ export function unionListToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -134,6 +143,7 @@ export function unionListToResult( | DumpObjectsHierarchyResult | ExecuteRpcResult | FindObjectsResult + | GetPageSourceResult | HelloResult | InspectObjectOnScreenResult | InspectObjectWithIdResult @@ -166,6 +176,8 @@ export function unionListToResult( return accessor(index, new ChangeConfigurationResult())! as ChangeConfigurationResult; case 'Packets_QueryProfileResult': return accessor(index, new QueryProfileResult())! as QueryProfileResult; + case 'Packets_GetPageSourceResult': + return accessor(index, new GetPageSourceResult())! as GetPageSourceResult; default: return null; } diff --git a/client/typescript/gamium/src/common/protocols/types.ts b/client/typescript/gamium/src/common/protocols/types.ts index c1a860f0..e42d81cf 100644 --- a/client/typescript/gamium/src/common/protocols/types.ts +++ b/client/typescript/gamium/src/common/protocols/types.ts @@ -2,7 +2,6 @@ import { ActionParam, AppQuitParamT, ErrorCode, - ErrorResultT, InputKeyParamT, InputMouseParamT, InputSetTextParamT, @@ -10,20 +9,16 @@ import { ObjectLocatorT, ObjectType, Param, - QueryProfileResultT, - QueryScreenResultT, Result, SleepParamT, -} from "./generated"; +} from './generated'; -type OmitedPackProperty = Omit; +type OmitedPackProperty = Omit; type FilledPlainObject = { [P in keyof T]: NonNullable }; type RemoveBytesToStringProperty = { [P in keyof T]: T[P] extends string | Uint8Array ? string : T[P]; }; -type FilteredGamiumObject = RemoveBytesToStringProperty< - FilledPlainObject> ->; +type FilteredGamiumObject = RemoveBytesToStringProperty>>; export type AppQuitParam = FilteredGamiumObject; export type InputKeyParam = FilteredGamiumObject; @@ -40,7 +35,7 @@ export { ObjectLocatorBy, UnityKeyboard, UnityKeyCode, -} from "./generated"; +} from './generated'; export { ActionParam }; export { ObjectType }; export { Param }; diff --git a/client/typescript/gamium/src/common/ui/ui.ts b/client/typescript/gamium/src/common/ui/ui.ts index 820a2354..f3dde877 100644 --- a/client/typescript/gamium/src/common/ui/ui.ts +++ b/client/typescript/gamium/src/common/ui/ui.ts @@ -1,64 +1,35 @@ -import { Vector3T } from "../protocols/generated"; -import { GamiumClient } from "../gamium-client"; -import { GamiumService } from "../gamium-service"; -import { isLocator, Locator } from "../locator/locator"; -import { UIElement } from "../object/ui-element"; -import { - ActionsClickOptions, - DefaultActionClickOptions, -} from "../options/actions-click-options"; -import { - ActionsDragOptions, - DefaultActionsDragOptions, -} from "../options/actions-drag-options"; -import { - ActionsScrollOptions, - DefaultActionScrollOptions, -} from "../options/actions-scroll-options"; -import { - DefaultFindObjectOptions, - FindObjectOptions, -} from "../options/find-object-options"; -import { Vector2 } from "../protocols/types"; -import { tryify, TryResult } from "../try"; -import { Until } from "../until"; +import { GamiumClient } from '../gamium-client'; +import { GamiumService } from '../gamium-service'; +import { isLocator, Locator } from '../locator/locator'; +import { UIElement } from '../object/ui-element'; +import { ActionsClickOptions, DefaultActionClickOptions } from '../options/actions-click-options'; +import { ActionsDragOptions, DefaultActionsDragOptions } from '../options/actions-drag-options'; +import { ActionsScrollOptions, DefaultActionScrollOptions } from '../options/actions-scroll-options'; +import { DefaultFindObjectOptions, FindObjectOptions } from '../options/find-object-options'; +import { Vector3T } from '../protocols/generated'; +import { Vector2 } from '../protocols/types'; +import { tryify, TryResult } from '../try'; +import { Until } from '../until'; export class UI { - constructor( - protected readonly game: GamiumClient, - protected readonly gamiumService: GamiumService - ) {} + constructor(protected readonly game: GamiumClient, protected readonly gamiumService: GamiumService) {} - async find( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): Promise { + async find(locator: Locator, options: Partial = DefaultFindObjectOptions()): Promise { const info = await this.game.wait(Until.objectLocated(locator, options)); return new UIElement(this.game, this.gamiumService, info); } - async tryFind( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): Promise> { + async tryFind(locator: Locator, options: Partial = DefaultFindObjectOptions()): Promise> { return tryify(this.find(locator, options)); } - async finds( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): Promise { + async finds(locator: Locator, options: Partial = DefaultFindObjectOptions()): Promise { const infos = await this.game.wait(Until.objectsLocated(locator, options)); - const elements = infos.map( - (i) => new UIElement(this.game, this.gamiumService, i) - ); + const elements = infos.map((i) => new UIElement(this.game, this.gamiumService, i)); return elements; } - async tryFinds( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): Promise> { + async tryFinds(locator: Locator, options: Partial = DefaultFindObjectOptions()): Promise> { return tryify(this.finds(locator, options)); } @@ -67,7 +38,7 @@ export class UI { options: Partial = { ...DefaultFindObjectOptions(), ...DefaultActionClickOptions(), - } + }, ): Promise { const element = await this.find(locator, options); await this.game.wait(Until.elementInteractable(element)); @@ -80,25 +51,18 @@ export class UI { options: Partial = { ...DefaultFindObjectOptions(), ...DefaultActionsDragOptions(), - } + }, ): Promise { const element = await this.find(locator, options); await this.game.wait(Until.elementInteractable(element)); let toPos = new Vector3T(0, 0, 0); if (isLocator(to)) { const toElement = await this.find(to, options); - toPos = new Vector3T( - toElement.info.screenPosition.x, - toElement.info.screenPosition.y, - toElement.info.screenPosition.z - ); + toPos = new Vector3T(toElement.info.screenPosition.x, toElement.info.screenPosition.y, toElement.info.screenPosition.z); } else { toPos = new Vector3T(to.x, to.y, 0); } - await this.game - .actions() - .drag(element.info.screenPosition, toPos, options) - .perform(); + await this.game.actions().drag(element.info.screenPosition, toPos, options).perform(); } async scroll( @@ -107,27 +71,20 @@ export class UI { options: Partial = { ...DefaultFindObjectOptions(), ...DefaultActionScrollOptions(), - } + }, ): Promise { const element = await this.find(locator, options); await this.game.wait(Until.elementInteractable(element)); await element.scroll(delta, options); } - async setText( - locator: Locator, - text: string, - options: Partial = DefaultFindObjectOptions() - ): Promise { + async setText(locator: Locator, text: string, options: Partial = DefaultFindObjectOptions()): Promise { const element = await this.find(locator, options); await this.game.wait(Until.elementInteractable(element)); await element.setText(text); } - async getText( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): Promise { + async getText(locator: Locator, options: Partial = DefaultFindObjectOptions()): Promise { const element = await this.find(locator, options); await this.game.wait(Until.elementInteractable(element)); return await element.getText(); diff --git a/client/typescript/gamium/src/common/until.ts b/client/typescript/gamium/src/common/until.ts index 7dc59854..3fceb6e5 100644 --- a/client/typescript/gamium/src/common/until.ts +++ b/client/typescript/gamium/src/common/until.ts @@ -1,74 +1,40 @@ -import { ErrorCode } from "./protocols/generated"; -import { - ObjectInfoCondition, - ObjectInfosCondition, - UIElementCondition, -} from "./condition"; -import { GamiumError } from "./errors/gamium-error"; -import { Locator } from "./locator/locator"; -import { UIElement } from "./object/ui-element"; -import { - DefaultFindObjectOptions, - FindObjectOptions, -} from "./options/find-object-options"; -import { - DefaultQueryObjectInteractableOptions, - QueryObjectInteractableOptions, -} from "./options/query-object-interactable-options"; +import { ObjectInfoCondition, ObjectInfosCondition, UIElementCondition } from './condition'; +import { GamiumError } from './errors/gamium-error'; +import { Locator } from './locator/locator'; +import { UIElement } from './object/ui-element'; +import { DefaultFindObjectOptions, FindObjectOptions } from './options/find-object-options'; +import { DefaultQueryObjectInteractableOptions, QueryObjectInteractableOptions } from './options/query-object-interactable-options'; +import { ErrorCode } from './protocols/generated'; export class Until { - static objectLocated( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): ObjectInfoCondition { - return new ObjectInfoCondition( - `locate element locator:${JSON.stringify(locator)}`, - (driver) => { - return driver.find(locator, options); - } - ); + static objectLocated(locator: Locator, options: Partial = DefaultFindObjectOptions()): ObjectInfoCondition { + return new ObjectInfoCondition(`locate element locator:${JSON.stringify(locator)}`, (driver) => { + return driver.find(locator, options); + }); } - static objectsLocated( - locator: Locator, - options: Partial = DefaultFindObjectOptions() - ): ObjectInfosCondition { - return new ObjectInfosCondition( - `locate element locator:${JSON.stringify(locator)}`, - (driver) => { - return driver.finds(locator, options); - } - ); + static objectsLocated(locator: Locator, options: Partial = DefaultFindObjectOptions()): ObjectInfosCondition { + return new ObjectInfosCondition(`locate element locator:${JSON.stringify(locator)}`, (driver) => { + return driver.finds(locator, options); + }); } - static elementInteractable( - param: UIElement, - options: Partial = DefaultQueryObjectInteractableOptions() - ): UIElementCondition { - return new UIElementCondition( - `locate element gameObject:${JSON.stringify(param)}`, - (_) => { - return new Promise((resolve, reject) => { - param - .isInteractable(options) - .then((interactable) => { - if (interactable) { - resolve(param); - } else { - reject( - new GamiumError( - ErrorCode.ObjectIsNotInteractable, - "object not interactable", - { element: param } - ) - ); - } - }) - .catch((err) => { - reject(err); - }); - }); - } - ); + static elementInteractable(param: UIElement, options: Partial = DefaultQueryObjectInteractableOptions()): UIElementCondition { + return new UIElementCondition(`locate element gameObject:${JSON.stringify(param)}`, (_) => { + return new Promise((resolve, reject) => { + param + .isInteractable(options) + .then((interactable) => { + if (interactable) { + resolve(param); + } else { + reject(new GamiumError(ErrorCode.ObjectIsNotInteractable, 'object not interactable', { element: param })); + } + }) + .catch((err) => { + reject(err); + }); + }); + }); } } diff --git a/client/typescript/gamium/src/common/version.ts b/client/typescript/gamium/src/common/version.ts index afdfdf46..60d696b4 100644 --- a/client/typescript/gamium/src/common/version.ts +++ b/client/typescript/gamium/src/common/version.ts @@ -1 +1 @@ -export const Version = '1.0.0'; +export const Version = '2.0.1'; diff --git a/client/typescript/gamium/src/node/node-gamium-service.ts b/client/typescript/gamium/src/node/node-gamium-service.ts index e915fe27..d8776a89 100644 --- a/client/typescript/gamium/src/node/node-gamium-service.ts +++ b/client/typescript/gamium/src/node/node-gamium-service.ts @@ -1,10 +1,10 @@ -import { ErrorCode, GamiumError, GamiumProtocol, GamiumService, PacketTypes, Version, createHello } from '../common'; +import { EventEmitter } from 'events'; +import * as flatbuffers from 'flatbuffers'; import { Socket } from 'net'; -import { SizePrefixedRecvQueue } from './size-prefixed-recv-queue'; -import { Printable } from '../common/internal/logs'; +import { createHello, ErrorCode, GamiumError, GamiumProtocol, GamiumService, PacketTypes, Version } from '../common'; import { delay, stringify, stringifyError } from '../common/internal/functions'; -import * as flatbuffers from 'flatbuffers'; -import { EventEmitter } from 'events'; +import { Printable } from '../common/internal/logs'; +import { SizePrefixedRecvQueue } from './size-prefixed-recv-queue'; const _dummyReq = new GamiumProtocol.RequestT(); const _dummyRes = new GamiumProtocol.ResponseT(); @@ -21,7 +21,12 @@ export class NodeGamiumService implements GamiumService { } private isConnected: boolean; private seq = 0; - constructor(private readonly host: string, private readonly port: number, private readonly requestTimeout: number = 50000, private readonly printable: Printable = console) { + constructor( + private readonly host: string, + private readonly port: number, + private readonly requestTimeout: number = 50000, + private readonly printable: Printable = console, + ) { this.client = new Socket(); this.isConnected = false; @@ -106,7 +111,10 @@ export class NodeGamiumService implements GamiumService { this.client.destroy(); } - request

(packet: PacketTypes, options: { timeout: number } = { timeout: this.requestTimeout }): Promise { + request

( + packet: PacketTypes, + options: { timeout: number } = { timeout: this.requestTimeout }, + ): Promise { return new Promise((resolve, reject) => { const { printable } = this; const befAsyncError = new Error('GamiumEngineService.request'); diff --git a/docs/docs/docs/contributing/engine-development/unity.mdx b/docs/docs/docs/contributing/engine-development/unity.mdx index 66c4570f..4f004a7b 100644 --- a/docs/docs/docs/contributing/engine-development/unity.mdx +++ b/docs/docs/docs/contributing/engine-development/unity.mdx @@ -60,5 +60,5 @@ If you have any questions about local package import, please refer to [**Unity P ### Build and Run -- If you return to the unity editor The script will build itself with the phrase "Compiling C# Scripts". +- If you return to the unity editor the script will build itself with the phrase "Compiling C# Scripts". - After that, press Play button to check if it runs normally. diff --git a/docs/docs/docs/engine/unity/project-configuration.mdx b/docs/docs/docs/engine/unity/project-configuration.mdx index a54aafc8..28afde5e 100644 --- a/docs/docs/docs/engine/unity/project-configuration.mdx +++ b/docs/docs/docs/engine/unity/project-configuration.mdx @@ -32,7 +32,7 @@ The source code and example project for the Gamium Engine SDK can be found at th ## 2. Add Scripting Define Symbol A `Scripting Define Symbol` called **`USE_GAMIUM`** is required for `Gamium` to work. **Only when `USE_GAMIUM`** is defined will the `Gamium Engine` run normally. -Go to the topic `Script Compilation` using the [Custom scripting symbols](https://docs.unity3d.com/Manual/CustomScriptingSymbols.html) guide and add **`USE_GAMIUM`**). +Go to the topic `Other Settings -> Script Compilation` using the [Custom scripting symbols](https://docs.unity3d.com/Manual/CustomScriptingSymbols.html) guide and add **`USE_GAMIUM`**). :::tip The `Gamium Engine SDK` has been added to the project, but if you do not want to run `Gamium Engine`, you must turn off **`USE_GAMIUM`**. diff --git a/engine/cpp/src/include/Internal/Protocol/inspector_packet_generated.h b/engine/cpp/src/include/Internal/Protocol/inspector_packet_generated.h index 8b88bd42..c4363186 100644 --- a/engine/cpp/src/include/Internal/Protocol/inspector_packet_generated.h +++ b/engine/cpp/src/include/Internal/Protocol/inspector_packet_generated.h @@ -45,6 +45,14 @@ struct DumpObjectsHierarchyResult; struct DumpObjectsHierarchyResultBuilder; struct DumpObjectsHierarchyResultT; +struct GetPageSourceParam; +struct GetPageSourceParamBuilder; +struct GetPageSourceParamT; + +struct GetPageSourceResult; +struct GetPageSourceResultBuilder; +struct GetPageSourceResultT; + inline const flatbuffers::TypeTable *InspectObjectOnScreenParamTypeTable(); inline const flatbuffers::TypeTable *InspectObjectOnScreenResultTypeTable(); @@ -57,6 +65,10 @@ inline const flatbuffers::TypeTable *DumpObjectsHierarchyParamTypeTable(); inline const flatbuffers::TypeTable *DumpObjectsHierarchyResultTypeTable(); +inline const flatbuffers::TypeTable *GetPageSourceParamTypeTable(); + +inline const flatbuffers::TypeTable *GetPageSourceResultTypeTable(); + struct InspectObjectOnScreenParamT : public flatbuffers::NativeTable { typedef InspectObjectOnScreenParam TableType; std::unique_ptr pos{}; @@ -439,6 +451,104 @@ inline flatbuffers::Offset CreateDumpObjectsHierarch flatbuffers::Offset CreateDumpObjectsHierarchyResult(flatbuffers::FlatBufferBuilder &_fbb, const DumpObjectsHierarchyResultT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +struct GetPageSourceParamT : public flatbuffers::NativeTable { + typedef GetPageSourceParam TableType; +}; + +struct GetPageSourceParam FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { + typedef GetPageSourceParamT NativeTableType; + typedef GetPageSourceParamBuilder Builder; + static const flatbuffers::TypeTable *MiniReflectTypeTable() { + return GetPageSourceParamTypeTable(); + } + bool Verify(flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + verifier.EndTable(); + } + GetPageSourceParamT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(GetPageSourceParamT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; + static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceParamT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +}; + +struct GetPageSourceParamBuilder { + typedef GetPageSourceParam Table; + flatbuffers::FlatBufferBuilder &fbb_; + flatbuffers::uoffset_t start_; + explicit GetPageSourceParamBuilder(flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = flatbuffers::Offset(end); + return o; + } +}; + +inline flatbuffers::Offset CreateGetPageSourceParam( + flatbuffers::FlatBufferBuilder &_fbb) { + GetPageSourceParamBuilder builder_(_fbb); + return builder_.Finish(); +} + +flatbuffers::Offset CreateGetPageSourceParam(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceParamT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + +struct GetPageSourceResultT : public flatbuffers::NativeTable { + typedef GetPageSourceResult TableType; + std::string page_source{}; +}; + +struct GetPageSourceResult FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { + typedef GetPageSourceResultT NativeTableType; + typedef GetPageSourceResultBuilder Builder; + static const flatbuffers::TypeTable *MiniReflectTypeTable() { + return GetPageSourceResultTypeTable(); + } + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_PAGE_SOURCE = 4 + }; + const flatbuffers::String *page_source() const { + return GetPointer(VT_PAGE_SOURCE); + } + bool Verify(flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyOffset(verifier, VT_PAGE_SOURCE) && + verifier.VerifyString(page_source()) && + verifier.EndTable(); + } + GetPageSourceResultT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const; + void UnPackTo(GetPageSourceResultT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const; + static flatbuffers::Offset Pack(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceResultT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); +}; + +struct GetPageSourceResultBuilder { + typedef GetPageSourceResult Table; + flatbuffers::FlatBufferBuilder &fbb_; + flatbuffers::uoffset_t start_; + void add_page_source(flatbuffers::Offset page_source) { + fbb_.AddOffset(GetPageSourceResult::VT_PAGE_SOURCE, page_source); + } + explicit GetPageSourceResultBuilder(flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = flatbuffers::Offset(end); + return o; + } +}; + +inline flatbuffers::Offset CreateGetPageSourceResult( + flatbuffers::FlatBufferBuilder &_fbb, + flatbuffers::Offset page_source = 0) { + GetPageSourceResultBuilder builder_(_fbb); + builder_.add_page_source(page_source); + return builder_.Finish(); +} + +flatbuffers::Offset CreateGetPageSourceResult(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceResultT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr); + inline InspectObjectOnScreenParamT::InspectObjectOnScreenParamT(const InspectObjectOnScreenParamT &o) : pos((o.pos) ? new Gamium::Protocol::Types::Vector2(*o.pos) : nullptr), screen_size((o.screen_size) ? new Gamium::Protocol::Types::Vector2(*o.screen_size) : nullptr) { @@ -635,6 +745,55 @@ inline flatbuffers::Offset CreateDumpObjectsHierarch _hierarchies); } +inline GetPageSourceParamT *GetPageSourceParam::UnPack(const flatbuffers::resolver_function_t *_resolver) const { + auto _o = std::unique_ptr(new GetPageSourceParamT()); + UnPackTo(_o.get(), _resolver); + return _o.release(); +} + +inline void GetPageSourceParam::UnPackTo(GetPageSourceParamT *_o, const flatbuffers::resolver_function_t *_resolver) const { + (void)_o; + (void)_resolver; +} + +inline flatbuffers::Offset GetPageSourceParam::Pack(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceParamT* _o, const flatbuffers::rehasher_function_t *_rehasher) { + return CreateGetPageSourceParam(_fbb, _o, _rehasher); +} + +inline flatbuffers::Offset CreateGetPageSourceParam(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceParamT *_o, const flatbuffers::rehasher_function_t *_rehasher) { + (void)_rehasher; + (void)_o; + struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const GetPageSourceParamT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + return Gamium::Protocol::Packets::CreateGetPageSourceParam( + _fbb); +} + +inline GetPageSourceResultT *GetPageSourceResult::UnPack(const flatbuffers::resolver_function_t *_resolver) const { + auto _o = std::unique_ptr(new GetPageSourceResultT()); + UnPackTo(_o.get(), _resolver); + return _o.release(); +} + +inline void GetPageSourceResult::UnPackTo(GetPageSourceResultT *_o, const flatbuffers::resolver_function_t *_resolver) const { + (void)_o; + (void)_resolver; + { auto _e = page_source(); if (_e) _o->page_source = _e->str(); } +} + +inline flatbuffers::Offset GetPageSourceResult::Pack(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceResultT* _o, const flatbuffers::rehasher_function_t *_rehasher) { + return CreateGetPageSourceResult(_fbb, _o, _rehasher); +} + +inline flatbuffers::Offset CreateGetPageSourceResult(flatbuffers::FlatBufferBuilder &_fbb, const GetPageSourceResultT *_o, const flatbuffers::rehasher_function_t *_rehasher) { + (void)_rehasher; + (void)_o; + struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const GetPageSourceResultT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va; + auto _page_source = _o->page_source.empty() ? _fbb.CreateSharedString("") : _fbb.CreateString(_o->page_source); + return Gamium::Protocol::Packets::CreateGetPageSourceResult( + _fbb, + _page_source); +} + inline const flatbuffers::TypeTable *InspectObjectOnScreenParamTypeTable() { static const flatbuffers::TypeCode type_codes[] = { { flatbuffers::ET_SEQUENCE, 0, 0 }, @@ -711,6 +870,23 @@ inline const flatbuffers::TypeTable *DumpObjectsHierarchyResultTypeTable() { return &tt; } +inline const flatbuffers::TypeTable *GetPageSourceParamTypeTable() { + static const flatbuffers::TypeTable tt = { + flatbuffers::ST_TABLE, 0, nullptr, nullptr, nullptr, nullptr, nullptr + }; + return &tt; +} + +inline const flatbuffers::TypeTable *GetPageSourceResultTypeTable() { + static const flatbuffers::TypeCode type_codes[] = { + { flatbuffers::ET_STRING, 0, -1 } + }; + static const flatbuffers::TypeTable tt = { + flatbuffers::ST_TABLE, 1, type_codes, nullptr, nullptr, nullptr, nullptr + }; + return &tt; +} + } // namespace Packets } // namespace Protocol } // namespace Gamium diff --git a/engine/cpp/src/include/Internal/Protocol/request_generated.h b/engine/cpp/src/include/Internal/Protocol/request_generated.h index 56df1b3d..680ddf11 100644 --- a/engine/cpp/src/include/Internal/Protocol/request_generated.h +++ b/engine/cpp/src/include/Internal/Protocol/request_generated.h @@ -44,11 +44,12 @@ enum class Param : uint8_t { Packets_DumpObjectsHierarchyParam = 9, Packets_ChangeConfigurationParam = 10, Packets_QueryProfileParam = 11, + Packets_GetPageSourceParam = 12, MIN = NONE, - MAX = Packets_QueryProfileParam + MAX = Packets_GetPageSourceParam }; -inline const Param (&EnumValuesParam())[12] { +inline const Param (&EnumValuesParam())[13] { static const Param values[] = { Param::NONE, Param::Packets_HelloParam, @@ -61,13 +62,14 @@ inline const Param (&EnumValuesParam())[12] { Param::Packets_InspectObjectWithIdParam, Param::Packets_DumpObjectsHierarchyParam, Param::Packets_ChangeConfigurationParam, - Param::Packets_QueryProfileParam + Param::Packets_QueryProfileParam, + Param::Packets_GetPageSourceParam }; return values; } inline const char * const *EnumNamesParam() { - static const char * const names[13] = { + static const char * const names[14] = { "NONE", "Packets_HelloParam", "Packets_QueryScreenParam", @@ -80,13 +82,14 @@ inline const char * const *EnumNamesParam() { "Packets_DumpObjectsHierarchyParam", "Packets_ChangeConfigurationParam", "Packets_QueryProfileParam", + "Packets_GetPageSourceParam", nullptr }; return names; } inline const char *EnumNameParam(Param e) { - if (flatbuffers::IsOutRange(e, Param::NONE, Param::Packets_QueryProfileParam)) return ""; + if (flatbuffers::IsOutRange(e, Param::NONE, Param::Packets_GetPageSourceParam)) return ""; const size_t index = static_cast(e); return EnumNamesParam()[index]; } @@ -139,6 +142,10 @@ template<> struct ParamTraits { static const Param enum_value = Param::Packets_QueryProfileParam; }; +template<> struct ParamTraits { + static const Param enum_value = Param::Packets_GetPageSourceParam; +}; + template struct ParamUnionTraits { static const Param enum_value = Param::NONE; }; @@ -187,6 +194,10 @@ template<> struct ParamUnionTraits struct ParamUnionTraits { + static const Param enum_value = Param::Packets_GetPageSourceParam; +}; + struct ParamUnion { Param type; void *value; @@ -305,6 +316,14 @@ struct ParamUnion { return type == Param::Packets_QueryProfileParam ? reinterpret_cast(value) : nullptr; } + Gamium::Protocol::Packets::GetPageSourceParamT *AsPackets_GetPageSourceParam() { + return type == Param::Packets_GetPageSourceParam ? + reinterpret_cast(value) : nullptr; + } + const Gamium::Protocol::Packets::GetPageSourceParamT *AsPackets_GetPageSourceParam() const { + return type == Param::Packets_GetPageSourceParam ? + reinterpret_cast(value) : nullptr; + } }; bool VerifyParam(flatbuffers::Verifier &verifier, const void *obj, Param type); @@ -370,6 +389,9 @@ struct Request FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const Gamium::Protocol::Packets::QueryProfileParam *param_as_Packets_QueryProfileParam() const { return param_type() == Gamium::Protocol::Param::Packets_QueryProfileParam ? static_cast(param()) : nullptr; } + const Gamium::Protocol::Packets::GetPageSourceParam *param_as_Packets_GetPageSourceParam() const { + return param_type() == Gamium::Protocol::Param::Packets_GetPageSourceParam ? static_cast(param()) : nullptr; + } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SEQ, 4) && @@ -427,6 +449,10 @@ template<> inline const Gamium::Protocol::Packets::QueryProfileParam *Request::p return param_as_Packets_QueryProfileParam(); } +template<> inline const Gamium::Protocol::Packets::GetPageSourceParam *Request::param_as() const { + return param_as_Packets_GetPageSourceParam(); +} + struct RequestBuilder { typedef Request Table; flatbuffers::FlatBufferBuilder &fbb_; @@ -546,6 +572,10 @@ inline bool VerifyParam(flatbuffers::Verifier &verifier, const void *obj, Param auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } + case Param::Packets_GetPageSourceParam: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } default: return true; } } @@ -609,6 +639,10 @@ inline void *ParamUnion::UnPack(const void *obj, Param type, const flatbuffers:: auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } + case Param::Packets_GetPageSourceParam: { + auto ptr = reinterpret_cast(obj); + return ptr->UnPack(resolver); + } default: return nullptr; } } @@ -660,6 +694,10 @@ inline flatbuffers::Offset ParamUnion::Pack(flatbuffers::FlatBufferBuilder auto ptr = reinterpret_cast(value); return CreateQueryProfileParam(_fbb, ptr, _rehasher).Union(); } + case Param::Packets_GetPageSourceParam: { + auto ptr = reinterpret_cast(value); + return CreateGetPageSourceParam(_fbb, ptr, _rehasher).Union(); + } default: return 0; } } @@ -710,6 +748,10 @@ inline ParamUnion::ParamUnion(const ParamUnion &u) : type(u.type), value(nullptr value = new Gamium::Protocol::Packets::QueryProfileParamT(*reinterpret_cast(u.value)); break; } + case Param::Packets_GetPageSourceParam: { + value = new Gamium::Protocol::Packets::GetPageSourceParamT(*reinterpret_cast(u.value)); + break; + } default: break; } @@ -772,6 +814,11 @@ inline void ParamUnion::Reset() { delete ptr; break; } + case Param::Packets_GetPageSourceParam: { + auto ptr = reinterpret_cast(value); + delete ptr; + break; + } default: break; } value = nullptr; @@ -791,7 +838,8 @@ inline const flatbuffers::TypeTable *ParamTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 7 }, { flatbuffers::ET_SEQUENCE, 0, 8 }, { flatbuffers::ET_SEQUENCE, 0, 9 }, - { flatbuffers::ET_SEQUENCE, 0, 10 } + { flatbuffers::ET_SEQUENCE, 0, 10 }, + { flatbuffers::ET_SEQUENCE, 0, 11 } }; static const flatbuffers::TypeFunction type_refs[] = { Gamium::Protocol::Packets::HelloParamTypeTable, @@ -804,10 +852,11 @@ inline const flatbuffers::TypeTable *ParamTypeTable() { Gamium::Protocol::Packets::InspectObjectWithIdParamTypeTable, Gamium::Protocol::Packets::DumpObjectsHierarchyParamTypeTable, Gamium::Protocol::Packets::ChangeConfigurationParamTypeTable, - Gamium::Protocol::Packets::QueryProfileParamTypeTable + Gamium::Protocol::Packets::QueryProfileParamTypeTable, + Gamium::Protocol::Packets::GetPageSourceParamTypeTable }; static const flatbuffers::TypeTable tt = { - flatbuffers::ST_UNION, 12, type_codes, type_refs, nullptr, nullptr, nullptr + flatbuffers::ST_UNION, 13, type_codes, type_refs, nullptr, nullptr, nullptr }; return &tt; } diff --git a/engine/cpp/src/include/Internal/Protocol/response_generated.h b/engine/cpp/src/include/Internal/Protocol/response_generated.h index c47c47c8..3066fbb2 100644 --- a/engine/cpp/src/include/Internal/Protocol/response_generated.h +++ b/engine/cpp/src/include/Internal/Protocol/response_generated.h @@ -45,11 +45,12 @@ enum class Result : uint8_t { Packets_DumpObjectsHierarchyResult = 9, Packets_ChangeConfigurationResult = 10, Packets_QueryProfileResult = 11, + Packets_GetPageSourceResult = 12, MIN = NONE, - MAX = Packets_QueryProfileResult + MAX = Packets_GetPageSourceResult }; -inline const Result (&EnumValuesResult())[12] { +inline const Result (&EnumValuesResult())[13] { static const Result values[] = { Result::NONE, Result::Packets_HelloResult, @@ -62,13 +63,14 @@ inline const Result (&EnumValuesResult())[12] { Result::Packets_InspectObjectWithIdResult, Result::Packets_DumpObjectsHierarchyResult, Result::Packets_ChangeConfigurationResult, - Result::Packets_QueryProfileResult + Result::Packets_QueryProfileResult, + Result::Packets_GetPageSourceResult }; return values; } inline const char * const *EnumNamesResult() { - static const char * const names[13] = { + static const char * const names[14] = { "NONE", "Packets_HelloResult", "Packets_QueryScreenResult", @@ -81,13 +83,14 @@ inline const char * const *EnumNamesResult() { "Packets_DumpObjectsHierarchyResult", "Packets_ChangeConfigurationResult", "Packets_QueryProfileResult", + "Packets_GetPageSourceResult", nullptr }; return names; } inline const char *EnumNameResult(Result e) { - if (flatbuffers::IsOutRange(e, Result::NONE, Result::Packets_QueryProfileResult)) return ""; + if (flatbuffers::IsOutRange(e, Result::NONE, Result::Packets_GetPageSourceResult)) return ""; const size_t index = static_cast(e); return EnumNamesResult()[index]; } @@ -140,6 +143,10 @@ template<> struct ResultTraits { static const Result enum_value = Result::Packets_QueryProfileResult; }; +template<> struct ResultTraits { + static const Result enum_value = Result::Packets_GetPageSourceResult; +}; + template struct ResultUnionTraits { static const Result enum_value = Result::NONE; }; @@ -188,6 +195,10 @@ template<> struct ResultUnionTraits struct ResultUnionTraits { + static const Result enum_value = Result::Packets_GetPageSourceResult; +}; + struct ResultUnion { Result type; void *value; @@ -306,6 +317,14 @@ struct ResultUnion { return type == Result::Packets_QueryProfileResult ? reinterpret_cast(value) : nullptr; } + Gamium::Protocol::Packets::GetPageSourceResultT *AsPackets_GetPageSourceResult() { + return type == Result::Packets_GetPageSourceResult ? + reinterpret_cast(value) : nullptr; + } + const Gamium::Protocol::Packets::GetPageSourceResultT *AsPackets_GetPageSourceResult() const { + return type == Result::Packets_GetPageSourceResult ? + reinterpret_cast(value) : nullptr; + } }; bool VerifyResult(flatbuffers::Verifier &verifier, const void *obj, Result type); @@ -380,6 +399,9 @@ struct Response FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const Gamium::Protocol::Packets::QueryProfileResult *result_as_Packets_QueryProfileResult() const { return result_type() == Gamium::Protocol::Result::Packets_QueryProfileResult ? static_cast(result()) : nullptr; } + const Gamium::Protocol::Packets::GetPageSourceResult *result_as_Packets_GetPageSourceResult() const { + return result_type() == Gamium::Protocol::Result::Packets_GetPageSourceResult ? static_cast(result()) : nullptr; + } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SEQ, 4) && @@ -439,6 +461,10 @@ template<> inline const Gamium::Protocol::Packets::QueryProfileResult *Response: return result_as_Packets_QueryProfileResult(); } +template<> inline const Gamium::Protocol::Packets::GetPageSourceResult *Response::result_as() const { + return result_as_Packets_GetPageSourceResult(); +} + struct ResponseBuilder { typedef Response Table; flatbuffers::FlatBufferBuilder &fbb_; @@ -579,6 +605,10 @@ inline bool VerifyResult(flatbuffers::Verifier &verifier, const void *obj, Resul auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } + case Result::Packets_GetPageSourceResult: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } default: return true; } } @@ -642,6 +672,10 @@ inline void *ResultUnion::UnPack(const void *obj, Result type, const flatbuffers auto ptr = reinterpret_cast(obj); return ptr->UnPack(resolver); } + case Result::Packets_GetPageSourceResult: { + auto ptr = reinterpret_cast(obj); + return ptr->UnPack(resolver); + } default: return nullptr; } } @@ -693,6 +727,10 @@ inline flatbuffers::Offset ResultUnion::Pack(flatbuffers::FlatBufferBuilde auto ptr = reinterpret_cast(value); return CreateQueryProfileResult(_fbb, ptr, _rehasher).Union(); } + case Result::Packets_GetPageSourceResult: { + auto ptr = reinterpret_cast(value); + return CreateGetPageSourceResult(_fbb, ptr, _rehasher).Union(); + } default: return 0; } } @@ -743,6 +781,10 @@ inline ResultUnion::ResultUnion(const ResultUnion &u) : type(u.type), value(null value = new Gamium::Protocol::Packets::QueryProfileResultT(*reinterpret_cast(u.value)); break; } + case Result::Packets_GetPageSourceResult: { + value = new Gamium::Protocol::Packets::GetPageSourceResultT(*reinterpret_cast(u.value)); + break; + } default: break; } @@ -805,6 +847,11 @@ inline void ResultUnion::Reset() { delete ptr; break; } + case Result::Packets_GetPageSourceResult: { + auto ptr = reinterpret_cast(value); + delete ptr; + break; + } default: break; } value = nullptr; @@ -824,7 +871,8 @@ inline const flatbuffers::TypeTable *ResultTypeTable() { { flatbuffers::ET_SEQUENCE, 0, 7 }, { flatbuffers::ET_SEQUENCE, 0, 8 }, { flatbuffers::ET_SEQUENCE, 0, 9 }, - { flatbuffers::ET_SEQUENCE, 0, 10 } + { flatbuffers::ET_SEQUENCE, 0, 10 }, + { flatbuffers::ET_SEQUENCE, 0, 11 } }; static const flatbuffers::TypeFunction type_refs[] = { Gamium::Protocol::Packets::HelloResultTypeTable, @@ -837,10 +885,11 @@ inline const flatbuffers::TypeTable *ResultTypeTable() { Gamium::Protocol::Packets::InspectObjectWithIdResultTypeTable, Gamium::Protocol::Packets::DumpObjectsHierarchyResultTypeTable, Gamium::Protocol::Packets::ChangeConfigurationResultTypeTable, - Gamium::Protocol::Packets::QueryProfileResultTypeTable + Gamium::Protocol::Packets::QueryProfileResultTypeTable, + Gamium::Protocol::Packets::GetPageSourceResultTypeTable }; static const flatbuffers::TypeTable tt = { - flatbuffers::ST_UNION, 12, type_codes, type_refs, nullptr, nullptr, nullptr + flatbuffers::ST_UNION, 13, type_codes, type_refs, nullptr, nullptr, nullptr }; return &tt; } diff --git a/engine/unity/Runtime/Private/Inspector/InspectorCommandHandler.cs b/engine/unity/Runtime/Private/Inspector/InspectorCommandHandler.cs index dc85de13..5a0a84e8 100644 --- a/engine/unity/Runtime/Private/Inspector/InspectorCommandHandler.cs +++ b/engine/unity/Runtime/Private/Inspector/InspectorCommandHandler.cs @@ -2,12 +2,15 @@ using System.Linq; using System.Threading.Tasks; using Gamium.Extensions; +using Gamium.Private; using Gamium.Private.Object; using Gamium.Private.Util; using Gamium.Protocol.Packets; using Gamium.Protocol.Types; +using Private.Inspector; using UnityEngine; using GamiumVector3 = Gamium.Protocol.Types.Vector3; +using Logger = Gamium.Private.Util.Logger; using Vector2 = UnityEngine.Vector2; namespace Gamium @@ -69,8 +72,7 @@ internal static Task> HandleInspectObje Info = objectInfo, })); } - - + internal static Task> HandleDumpObjectHierarchy( DumpObjectsHierarchyParamT req) { @@ -99,12 +101,23 @@ internal static Task> HandleDumpObject hierarchies[treeName].Children.Add(r.ToHierarchyNode()); } - - + return Task.FromResult(new PacketResult(new DumpObjectsHierarchyResultT { Hierarchies = hierarchies.Values.ToList() })); } + + internal static Task> HandleGetPageSource( + GetPageSourceParamT req) + { + var roots = GamiumObjectRegistry.GetRoots().ToArray(); + var pageSource = PageSourceSerializer.Serialize(Server.instance, roots); + + return Task.FromResult(new PacketResult(new GetPageSourceResultT + { + PageSource = pageSource + })); + } } } diff --git a/engine/unity/Runtime/Private/Inspector/PageSource.cs b/engine/unity/Runtime/Private/Inspector/PageSource.cs new file mode 100644 index 00000000..7a872732 --- /dev/null +++ b/engine/unity/Runtime/Private/Inspector/PageSource.cs @@ -0,0 +1,58 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using UnityEngine; +using System.Xml; +using Gamium.Private; +using Gamium.Private.Object; + +namespace Private.Inspector +{ + internal static class PageSourceSerializer + { + internal static string Serialize(Server server, GamiumObject[] roots) + { + XmlDocument document = new XmlDocument(); + document.AppendChild(document.CreateXmlDeclaration("1.0", "UTF-8", null)); + XmlElement hierarchy = document.CreateElement("hierarchy"); + hierarchy.SetAttribute("gamium-version", server.GetVersion()); + hierarchy.SetAttribute("width", Screen.width.ToString()); + hierarchy.SetAttribute("height", Screen.height.ToString()); + hierarchy.SetAttribute("orientation", Screen.orientation.ToString()); + document.AppendChild(hierarchy); + + var scenes = new Dictionary(); + for (int i = 0; i < roots.Length; ++i) + { + var root = roots[i]; + var sceneName = "Unknown"; + if (root is GameObjectGamiumObject go) + { + sceneName = go.value.scene.name; + } + else if (root is VisualElementGamiumObject vgoo) + { + sceneName = "VisualElement"; + } + + if (!scenes.ContainsKey((sceneName))) + { + XmlElement scene = document.CreateElement("scene"); + scene.SetAttribute("name", sceneName); + scene.SetAttribute("index", (hierarchy.ChildNodes.Count + 1).ToString()); + hierarchy.AppendChild(scene); + scenes.Add(sceneName, scene); + } + + var index = scenes[sceneName].ChildNodes.Count + 1; + scenes[sceneName].AppendChild(root.ToXmlElement(document, index)); + } + + StringWriter stringWriter = new StringWriter(); + XmlTextWriter xmlTextWriter = new XmlTextWriter(stringWriter); + document.WriteTo(xmlTextWriter); + string xmlString = stringWriter.ToString(); + return xmlString; + } + } +} diff --git a/engine/unity/Runtime/Private/Inspector/PageSource.cs.meta b/engine/unity/Runtime/Private/Inspector/PageSource.cs.meta new file mode 100644 index 00000000..d31bd173 --- /dev/null +++ b/engine/unity/Runtime/Private/Inspector/PageSource.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f221276f77724ecdb9a41f209192f7aa +timeCreated: 1686751747 \ No newline at end of file diff --git a/engine/unity/Runtime/Private/Network/Server.cs b/engine/unity/Runtime/Private/Network/Server.cs index a55ecb88..d420937a 100644 --- a/engine/unity/Runtime/Private/Network/Server.cs +++ b/engine/unity/Runtime/Private/Network/Server.cs @@ -121,7 +121,7 @@ public int Update() public string GetVersion() { - return "1.0.0"; + return "2.0.1"; } public string GetLastErrorMessage() diff --git a/engine/unity/Runtime/Private/Object/Gamium/GameObjectGamiumObject.cs b/engine/unity/Runtime/Private/Object/Gamium/GameObjectGamiumObject.cs index 4178672c..5bc63bf1 100644 --- a/engine/unity/Runtime/Private/Object/Gamium/GameObjectGamiumObject.cs +++ b/engine/unity/Runtime/Private/Object/Gamium/GameObjectGamiumObject.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using System.Xml; using Gamium.Extensions; using Gamium.Private.Debug; using Gamium.Private.Util; @@ -9,6 +10,7 @@ using TMPro; using UnityEngine; using UnityEngine.UI; +using Logger = Gamium.Private.Util.Logger; using Vector2 = UnityEngine.Vector2; using Vector3 = UnityEngine.Vector3; @@ -214,5 +216,25 @@ internal override Task IsInteractable(QueryObjectInteractableParam { return GameObjectInteractability.IsInteractable(param, value); } + + protected override void SetXmlAttributes(XmlElement thisElement, int index) + { + thisElement.SetAttribute("name", GetName()); + thisElement.SetAttribute("index", index.ToString()); + thisElement.SetAttribute("text", GetText()); + Vector3 pos = Vector3.zero; + Vector2 rectSize = Vector2.zero; + ErrorResultT err = value.GetScreenPositionAndRectSize(out pos, out rectSize); + if (!err.IsSuccess()) + { + Logger.Error($"GameObjectGamiumObject.UpdateXmlAttributes: {err}"); + } + thisElement.SetAttribute("screen-position", $"{pos.x},{pos.y},{pos.z}"); + thisElement.SetAttribute("screen-rect-size", $"{rectSize.x},{rectSize.y}"); + var position = value.transform.position; + thisElement.SetAttribute("position", $"{position.x},{position.y},{position.z}"); + var rotation = value.transform.rotation; + thisElement.SetAttribute("rotation", $"{rotation.x},{rotation.y},{rotation.z},{rotation.w}"); + } } } diff --git a/engine/unity/Runtime/Private/Object/Gamium/GamiumObject.cs b/engine/unity/Runtime/Private/Object/Gamium/GamiumObject.cs index 3f1d243e..e25204af 100644 --- a/engine/unity/Runtime/Private/Object/Gamium/GamiumObject.cs +++ b/engine/unity/Runtime/Private/Object/Gamium/GamiumObject.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using System.Xml; using Gamium.Protocol.Packets; using Gamium.Protocol.Types; using UnityEngine; @@ -42,5 +43,23 @@ internal ObjectHierarchyNodeT ToHierarchyNode() Children = GetChildren().Select(c => c.ToHierarchyNode()).ToList(), }; } + + protected abstract void SetXmlAttributes(XmlElement thisElement, int index); + + internal XmlElement ToXmlElement(XmlDocument document, int index) + { + var element = document.CreateElement(GetGamiumObjectType().ToString()); + + SetXmlAttributes(element, index); + GetChildren() + .Select((child, childIndex) => child.ToXmlElement(document, childIndex + 1)) + .ToList() + .ForEach((childElement) => + { + element.AppendChild(childElement); + }); + + return element; + } } } diff --git a/engine/unity/Runtime/Private/Object/Gamium/VisualElementGamiumObject.cs b/engine/unity/Runtime/Private/Object/Gamium/VisualElementGamiumObject.cs index 30d436d2..0fc2cf53 100644 --- a/engine/unity/Runtime/Private/Object/Gamium/VisualElementGamiumObject.cs +++ b/engine/unity/Runtime/Private/Object/Gamium/VisualElementGamiumObject.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using System.Xml; using Gamium.Extensions; using Gamium.Private.Debug; using Gamium.Private.Util; @@ -8,6 +9,7 @@ using Gamium.Protocol.Types; using UnityEngine; using UnityEngine.UIElements; +using Logger = Gamium.Private.Util.Logger; using Vector2 = UnityEngine.Vector2; using Vector3 = UnityEngine.Vector3; using Vector4 = UnityEngine.Vector4; @@ -88,8 +90,8 @@ protected override ObjectType GetObjectType() { return ObjectType.UI; } - - protected override ErrorResultT GetScreenPositionAndRectSize(out Vector3 pos, out Vector2 bounds) + + private ErrorResultT GetScreenPositionAndRectSizeInternal(out Vector3 pos, out Vector2 bounds) { var panelToScreenRatio = value.panel.PanelToScreenRatio(out var panelSize); @@ -102,9 +104,16 @@ protected override ErrorResultT GetScreenPositionAndRectSize(out Vector3 pos, ou yCenter * panelToScreenRatio.y, 0); bounds = new Vector2(value.worldBound.size.x * panelToScreenRatio.x, value.worldBound.size.y * panelToScreenRatio.y); + + return ErrorResultExtensions.None; + } + + protected override ErrorResultT GetScreenPositionAndRectSize(out Vector3 pos, out Vector2 bounds) + { + var err = GetScreenPositionAndRectSizeInternal(out pos, out bounds); Visual.ShowText(pos, 1.5f, "?"); - return ErrorResultExtensions.None; + return err; } protected override string GetText() @@ -217,5 +226,25 @@ internal override async Task IsInteractable(QueryObjectInteractabl return (ErrorResultExtensions.None); } + + protected override void SetXmlAttributes(XmlElement thisElement, int index) + { + thisElement.SetAttribute("name", GetName()); + thisElement.SetAttribute("index", index.ToString()); + thisElement.SetAttribute("text", GetText()); + Vector3 pos = Vector3.zero; + Vector2 rectSize = Vector2.zero; + var err = GetScreenPositionAndRectSizeInternal(out pos, out rectSize); + if (!err.IsSuccess()) + { + Logger.Error($"VisualElement({GetPath()}) GetScreenPositionAndRectSizeInternal failed. {err}"); + } + thisElement.SetAttribute("screen-position", $"{pos.x},{pos.y},{pos.z}"); + thisElement.SetAttribute("screen-rect-size", $"{rectSize.x},{rectSize.y}"); + var position = value.transform.position; + thisElement.SetAttribute("position", $"{position.x},{position.y},{position.z}"); + var rotation = value.transform.rotation; + thisElement.SetAttribute("rotation", $"{rotation.x},{rotation.y},{rotation.z},{rotation.w}"); + } } } diff --git a/engine/unity/Runtime/Private/Protocol/InternalCommandHandler.cs b/engine/unity/Runtime/Private/Protocol/InternalCommandHandler.cs index 45e8f5bb..48ccbb5b 100644 --- a/engine/unity/Runtime/Private/Protocol/InternalCommandHandler.cs +++ b/engine/unity/Runtime/Private/Protocol/InternalCommandHandler.cs @@ -31,6 +31,7 @@ internal static void Setup() PacketTypes.dumpObjectsHierarchy.SetInternalHandler(InspectorCommandHandler.HandleDumpObjectHierarchy); PacketTypes.changeConfiguration.SetInternalHandler(HandleChangeConfiguration); PacketTypes.queryProfile.SetInternalHandler(HandleQueryProfile); + PacketTypes.getPageSource.SetInternalHandler(InspectorCommandHandler.HandleGetPageSource); Logger.Verbose($"InternalCommandHandler Setup complete"); } diff --git a/engine/unity/Runtime/Public/PacketTypes.cs b/engine/unity/Runtime/Public/PacketTypes.cs index e7054607..794e3533 100644 --- a/engine/unity/Runtime/Public/PacketTypes.cs +++ b/engine/unity/Runtime/Public/PacketTypes.cs @@ -217,6 +217,17 @@ internal PacketQueryProfileMapping() : base( } } + internal class PacketGetPageSourceMapping : PacketTypeMapping + { + internal PacketGetPageSourceMapping() : base( + Param.Packets_GetPageSourceParam, + Result.Packets_GetPageSourceResult, + req => req.Param.AsPackets_GetPageSourceParam(), + ResultUnion.FromPackets_GetPageSourceResult) + { + } + } + public static class PacketTypes { internal static PacketHelloMapping hello = new PacketHelloMapping(); @@ -237,6 +248,8 @@ internal static PacketDumpObjectsHierarchyMapping internal static PacketChangeConfigurationMapping changeConfiguration = new PacketChangeConfigurationMapping(); internal static PacketQueryProfileMapping queryProfile = new PacketQueryProfileMapping(); + internal static PacketGetPageSourceMapping getPageSource = new PacketGetPageSourceMapping(); + internal static Dictionary mappings = new Dictionary { { hello.paramType, hello }, @@ -250,6 +263,7 @@ internal static PacketDumpObjectsHierarchyMapping { dumpObjectsHierarchy.paramType, dumpObjectsHierarchy }, { changeConfiguration.paramType, changeConfiguration }, { queryProfile.paramType, queryProfile }, + { getPageSource.paramType, getPageSource } }; private static void TestHandler() diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium.meta index 9225a360..83d59b0f 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d06bb91a70ce46729ed51f6ec0644d2 +guid: 0efd434b60aa349ebbf6958d0386a276 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol.meta index 690c35e1..93d7dd5b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ba15e6beaa25e446dbdb8ee8ff916792 +guid: 25be467c53e8d4b2a91bf7dd3a79332c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets.meta index 7a338873..3691a8e7 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45c8683d8fce048e9a270603c673dc6d +guid: 9df6021f8e2844562b057fc01e13de57 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParam.cs.meta index e1788bbb..49d4893e 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8b3b6fc53a97436f9d5c3f28e7cfc3b +guid: 71e2854930071423cbdcc47841c7f6e5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParamSingle.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParamSingle.cs.meta index 65ca3803..2d7dd65f 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParamSingle.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionParamSingle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64be89438ce9f44ce904c544510a1885 +guid: f22da8451c5584b6f8f8ef19dc784814 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionResult.cs.meta index d22097cd..d6efd432 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 84af9df5a907440eca2326c7925353c9 +guid: 38c6dbc228356438b9427f766db18247 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions.meta index ca4357d9..c9b50227 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe5776b71309544f6bf555b1d28f5a6f +guid: 65386823319da482b8397487c4d0f2e2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/AppQuitParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/AppQuitParam.cs.meta index ad5acc40..cfdc1203 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/AppQuitParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/AppQuitParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 202e10615dc834903bb47264995a740f +guid: 8cdd536ef3ed84a00a73952224bfecc8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputKeyParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputKeyParam.cs.meta index 67748a0e..76d3fa0b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputKeyParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputKeyParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 771eae8ac1eeb4546910ee09d7ab0bf0 +guid: 19d3500253ae94553b2b8b99a90fb8c6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputMouseParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputMouseParam.cs.meta index 3f03d79d..1348c429 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputMouseParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputMouseParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42d631ae41cd849c3a8341a334ba7030 +guid: 697f7098a6b5d45fea7bb68c939a6745 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputSetTextParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputSetTextParam.cs.meta index 2e6edcd9..6f3bf45b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputSetTextParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/InputSetTextParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7756ff1089100442b8fde7810a641131 +guid: 877125174ef9640b99d736b7c4f505f8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerBy.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerBy.cs.meta index 48047bba..623fc50f 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerBy.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerBy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9588f74c83c147299be41d4b66250a9 +guid: c20ea0025fc774a29863ad8df8fab814 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerParam.cs.meta index 90dd580b..694b6250 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/MovePlayerParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 602227ee00ad146d8a137671b75a7d47 +guid: e15328388e66f43789ced83731fc797c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/SleepParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/SleepParam.cs.meta index b7b0a783..d2eba394 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/SleepParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Actions/SleepParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c72190eb244214229a6dfafe6bffa1e6 +guid: 7834c4edc52444fe4b8baa89e8709dc3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsParam.cs.meta index 170d10c8..a4524533 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ad900580f7714342a9685c219a2629c +guid: 98845698210484907a872c2ff092318c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsResult.cs.meta index 5194e79d..358da08f 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ActionsResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d9e3ba3270f34c928f45ba8cd7a7c12 +guid: 6afb856b31215402b883c7438a5b63dd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationParam.cs.meta index 9809ff13..6aae2c93 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c758029d7105547429d649d7b6a1c79a +guid: 0a4bde643f80840a483eb7fb214bb71f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationResult.cs.meta index 36cb0810..3ece817d 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ChangeConfigurationResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23c1abfb05a9845c0b3bb4a2279265e1 +guid: 3a1c55ec5d2634a169cefbf9e16c8753 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyParam.cs.meta index 3b78a6db..ef37d6a1 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2e9c21ae5bfa4cb08c9ff142f80d1b5 +guid: 8605661d05d414d2f8f3322129d13733 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyResult.cs.meta index 09d183a8..f74d63b3 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/DumpObjectsHierarchyResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d042d6e62af85492f8d01ca91e571312 +guid: 3f21310217c444569a216aa2fb2af6c3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Env.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Env.cs.meta index aeda043f..823745f0 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Env.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/Env.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5d8fea59d1e24e8ab8848f7fd9bdd3b +guid: 61cf80f6717a140bd95ffa460a23d44b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcParam.cs.meta index 47c9b826..0fec7d1b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0209d5969c6843db80b24deb655f545 +guid: df0870379f8c14b49a2594dbb2023f2e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcResult.cs.meta index 07986867..2435d3ad 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/ExecuteRpcResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 169b646124af148fc9274e20f48e322f +guid: c0cc42af3b51745b9bd004b4876f8912 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsParam.cs.meta index ef79c268..9d9cd08f 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c35ae8e059c847b5896d858a1f0201f +guid: 39be30f66e17e44fb9a8b3fadcdd5880 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsResult.cs.meta index 90cfd6fd..78dba859 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/FindObjectsResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4a29d89368884a1dadd6cf3b689a280 +guid: 5992496019a304f308ddd157928a8240 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs new file mode 100644 index 00000000..4e8689f0 --- /dev/null +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs @@ -0,0 +1,50 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace Gamium.Protocol.Packets +{ + +using global::System; +using global::System.Collections.Generic; +using global::Google.FlatBuffers; + +public struct GetPageSourceParam : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_10_26(); } + public static GetPageSourceParam GetRootAsGetPageSourceParam(ByteBuffer _bb) { return GetRootAsGetPageSourceParam(_bb, new GetPageSourceParam()); } + public static GetPageSourceParam GetRootAsGetPageSourceParam(ByteBuffer _bb, GetPageSourceParam obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public GetPageSourceParam __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + + public static void StartGetPageSourceParam(FlatBufferBuilder builder) { builder.StartTable(0); } + public static Offset EndGetPageSourceParam(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public GetPageSourceParamT UnPack() { + var _o = new GetPageSourceParamT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(GetPageSourceParamT _o) { + } + public static Offset Pack(FlatBufferBuilder builder, GetPageSourceParamT _o) { + if (_o == null) return default(Offset); + StartGetPageSourceParam(builder); + return EndGetPageSourceParam(builder); + } +} + +public class GetPageSourceParamT +{ + + public GetPageSourceParamT() { + } +} + + +} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs.meta new file mode 100644 index 00000000..4d3902bd --- /dev/null +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceParam.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8cb2fdb1d272f428e95056141401ce23 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs new file mode 100644 index 00000000..382f59bb --- /dev/null +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs @@ -0,0 +1,70 @@ +// +// automatically generated by the FlatBuffers compiler, do not modify +// + +namespace Gamium.Protocol.Packets +{ + +using global::System; +using global::System.Collections.Generic; +using global::Google.FlatBuffers; + +public struct GetPageSourceResult : IFlatbufferObject +{ + private Table __p; + public ByteBuffer ByteBuffer { get { return __p.bb; } } + public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_22_10_26(); } + public static GetPageSourceResult GetRootAsGetPageSourceResult(ByteBuffer _bb) { return GetRootAsGetPageSourceResult(_bb, new GetPageSourceResult()); } + public static GetPageSourceResult GetRootAsGetPageSourceResult(ByteBuffer _bb, GetPageSourceResult obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } + public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } + public GetPageSourceResult __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } + + public string PageSource { get { int o = __p.__offset(4); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } } +#if ENABLE_SPAN_T + public Span GetPageSourceBytes() { return __p.__vector_as_span(4, 1); } +#else + public ArraySegment? GetPageSourceBytes() { return __p.__vector_as_arraysegment(4); } +#endif + public byte[] GetPageSourceArray() { return __p.__vector_as_array(4); } + + public static Offset CreateGetPageSourceResult(FlatBufferBuilder builder, + StringOffset page_sourceOffset = default(StringOffset)) { + builder.StartTable(1); + GetPageSourceResult.AddPageSource(builder, page_sourceOffset); + return GetPageSourceResult.EndGetPageSourceResult(builder); + } + + public static void StartGetPageSourceResult(FlatBufferBuilder builder) { builder.StartTable(1); } + public static void AddPageSource(FlatBufferBuilder builder, StringOffset pageSourceOffset) { builder.AddOffset(0, pageSourceOffset.Value, 0); } + public static Offset EndGetPageSourceResult(FlatBufferBuilder builder) { + int o = builder.EndTable(); + return new Offset(o); + } + public GetPageSourceResultT UnPack() { + var _o = new GetPageSourceResultT(); + this.UnPackTo(_o); + return _o; + } + public void UnPackTo(GetPageSourceResultT _o) { + _o.PageSource = this.PageSource; + } + public static Offset Pack(FlatBufferBuilder builder, GetPageSourceResultT _o) { + if (_o == null) return default(Offset); + var _page_source = _o.PageSource == null ? default(StringOffset) : builder.CreateString(_o.PageSource); + return CreateGetPageSourceResult( + builder, + _page_source); + } +} + +public class GetPageSourceResultT +{ + public string PageSource { get; set; } + + public GetPageSourceResultT() { + this.PageSource = null; + } +} + + +} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs.meta new file mode 100644 index 00000000..afda76eb --- /dev/null +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/GetPageSourceResult.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f9f60a7d9637d4797b687b493f92a42b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloParam.cs.meta index bd781730..6a9f496b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6e698f1f19324310aa7bf0fea9787d5 +guid: 418ca917198bb4129b2e26a3d1000d9b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloResult.cs.meta index dd9d4667..1b6338ec 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/HelloResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32d7cbb761c8249ff8d9e9594e083fd4 +guid: 61ff8b71d8434441a8b3144abe78f5fd MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenParam.cs.meta index e4bf16d8..77618b46 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9dadf02f0d6bd408393ee9f7a58ddcbd +guid: d593cbf5c65cd4777a79da5a1904e72c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenResult.cs.meta index 635367b6..622f2e72 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectOnScreenResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1e4ac8fd0e9449e1b2d76958c858bd6 +guid: 072fe9018c34c4a1ea1eb3529cef3129 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdParam.cs.meta index 71069af1..2f903c0b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7a5aa958402ed405b9411a59fe3ec9cc +guid: a9a69fe56e41c45768781a965d6562bb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdResult.cs.meta index 7809b013..75655c8a 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/InspectObjectWithIdResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 511f268b18f104e28a243e117c3f9708 +guid: 59c608e0883954f72ac1c93d11703fc8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableParam.cs.meta index 864c96ff..a0b0f558 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1006b6b62db604feaa4b9209b999a42f +guid: 4ef89956a941b493caf34ba32e0f494a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableResult.cs.meta index 3a78b4c0..1a4b2a8d 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryObjectInteractableResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0d8df6f649ff54ea6be613761357c145 +guid: e6d1bef3a26da41479bcbb999ca3b90f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileParam.cs.meta index 40a06e8e..f708e56e 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2356782f1a05b40ccad3aecd8591eaf2 +guid: 5761ecdbf2f9f4de09ecbe936c59cd05 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileResult.cs.meta index 142a5961..d09b7ce2 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryProfileResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0b686f85f9b445f893732458e7026c1 +guid: 2104ec9864d27462ba1b9a49659d9c37 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenParam.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenParam.cs.meta index 3f4a3169..35d8d662 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenParam.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenParam.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e3826aaa5e5e475ebf9473e2b6c6c43 +guid: 5c92aeec805604a5f98ebcf1e921ee5a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenResult.cs.meta index b05bb40a..4b75aca7 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Packets/QueryScreenResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97bf07196160b4374a8cf985ed962572 +guid: 09019a2958bc1482bbf0ac7682b20c51 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs index 331bdab7..8f397616 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs @@ -19,6 +19,7 @@ public enum Param : byte Packets_DumpObjectsHierarchyParam = 9, Packets_ChangeConfigurationParam = 10, Packets_QueryProfileParam = 11, + Packets_GetPageSourceParam = 12, }; public class ParamUnion { @@ -53,6 +54,8 @@ public ParamUnion() { public static ParamUnion FromPackets_ChangeConfigurationParam(Gamium.Protocol.Packets.ChangeConfigurationParamT _packets_changeconfigurationparam) { return new ParamUnion{ Type = Param.Packets_ChangeConfigurationParam, Value = _packets_changeconfigurationparam }; } public Gamium.Protocol.Packets.QueryProfileParamT AsPackets_QueryProfileParam() { return this.As(); } public static ParamUnion FromPackets_QueryProfileParam(Gamium.Protocol.Packets.QueryProfileParamT _packets_queryprofileparam) { return new ParamUnion{ Type = Param.Packets_QueryProfileParam, Value = _packets_queryprofileparam }; } + public Gamium.Protocol.Packets.GetPageSourceParamT AsPackets_GetPageSourceParam() { return this.As(); } + public static ParamUnion FromPackets_GetPageSourceParam(Gamium.Protocol.Packets.GetPageSourceParamT _packets_getpagesourceparam) { return new ParamUnion{ Type = Param.Packets_GetPageSourceParam, Value = _packets_getpagesourceparam }; } public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, ParamUnion _o) { switch (_o.Type) { @@ -68,6 +71,7 @@ public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, ParamUnion case Param.Packets_DumpObjectsHierarchyParam: return Gamium.Protocol.Packets.DumpObjectsHierarchyParam.Pack(builder, _o.AsPackets_DumpObjectsHierarchyParam()).Value; case Param.Packets_ChangeConfigurationParam: return Gamium.Protocol.Packets.ChangeConfigurationParam.Pack(builder, _o.AsPackets_ChangeConfigurationParam()).Value; case Param.Packets_QueryProfileParam: return Gamium.Protocol.Packets.QueryProfileParam.Pack(builder, _o.AsPackets_QueryProfileParam()).Value; + case Param.Packets_GetPageSourceParam: return Gamium.Protocol.Packets.GetPageSourceParam.Pack(builder, _o.AsPackets_GetPageSourceParam()).Value; } } } diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs.meta index 09ba8ad7..508125fe 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Param.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac07c5718c7d84e1d8be696c894ea93d +guid: 49d7b1bb2016f4f80b4d30966f616445 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs index ee5ce76b..4b9e9e0d 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs @@ -33,6 +33,7 @@ public struct Request : IFlatbufferObject public Gamium.Protocol.Packets.DumpObjectsHierarchyParam ParamAsPackets_DumpObjectsHierarchyParam() { return Param().Value; } public Gamium.Protocol.Packets.ChangeConfigurationParam ParamAsPackets_ChangeConfigurationParam() { return Param().Value; } public Gamium.Protocol.Packets.QueryProfileParam ParamAsPackets_QueryProfileParam() { return Param().Value; } + public Gamium.Protocol.Packets.GetPageSourceParam ParamAsPackets_GetPageSourceParam() { return Param().Value; } public static Offset CreateRequest(FlatBufferBuilder builder, uint seq = 0, @@ -99,6 +100,9 @@ public void UnPackTo(RequestT _o) { case Gamium.Protocol.Param.Packets_QueryProfileParam: _o.Param.Value = this.Param().HasValue ? this.Param().Value.UnPack() : null; break; + case Gamium.Protocol.Param.Packets_GetPageSourceParam: + _o.Param.Value = this.Param().HasValue ? this.Param().Value.UnPack() : null; + break; } } public static Offset Pack(FlatBufferBuilder builder, RequestT _o) { diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs.meta index 72eb9310..8b721411 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Request.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aaa829b3108a54a3eb2095f6c371aca6 +guid: 101f7e18bfa7b4df4a6ce469111ca751 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs index 2d21be5d..c01e0ae3 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs @@ -34,6 +34,7 @@ public struct Response : IFlatbufferObject public Gamium.Protocol.Packets.DumpObjectsHierarchyResult ResultAsPackets_DumpObjectsHierarchyResult() { return Result().Value; } public Gamium.Protocol.Packets.ChangeConfigurationResult ResultAsPackets_ChangeConfigurationResult() { return Result().Value; } public Gamium.Protocol.Packets.QueryProfileResult ResultAsPackets_QueryProfileResult() { return Result().Value; } + public Gamium.Protocol.Packets.GetPageSourceResult ResultAsPackets_GetPageSourceResult() { return Result().Value; } public static Offset CreateResponse(FlatBufferBuilder builder, uint seq = 0, @@ -104,6 +105,9 @@ public void UnPackTo(ResponseT _o) { case Gamium.Protocol.Result.Packets_QueryProfileResult: _o.Result.Value = this.Result().HasValue ? this.Result().Value.UnPack() : null; break; + case Gamium.Protocol.Result.Packets_GetPageSourceResult: + _o.Result.Value = this.Result().HasValue ? this.Result().Value.UnPack() : null; + break; } } public static Offset Pack(FlatBufferBuilder builder, ResponseT _o) { diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs.meta index 9f5ea599..514ce2db 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Response.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72a78ea85d1374de6b9176ef48ca4fa1 +guid: 5205f99f4ff94467693ed5bb97c7f1aa MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs index 85c41124..996e1669 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs @@ -19,6 +19,7 @@ public enum Result : byte Packets_DumpObjectsHierarchyResult = 9, Packets_ChangeConfigurationResult = 10, Packets_QueryProfileResult = 11, + Packets_GetPageSourceResult = 12, }; public class ResultUnion { @@ -53,6 +54,8 @@ public ResultUnion() { public static ResultUnion FromPackets_ChangeConfigurationResult(Gamium.Protocol.Packets.ChangeConfigurationResultT _packets_changeconfigurationresult) { return new ResultUnion{ Type = Result.Packets_ChangeConfigurationResult, Value = _packets_changeconfigurationresult }; } public Gamium.Protocol.Packets.QueryProfileResultT AsPackets_QueryProfileResult() { return this.As(); } public static ResultUnion FromPackets_QueryProfileResult(Gamium.Protocol.Packets.QueryProfileResultT _packets_queryprofileresult) { return new ResultUnion{ Type = Result.Packets_QueryProfileResult, Value = _packets_queryprofileresult }; } + public Gamium.Protocol.Packets.GetPageSourceResultT AsPackets_GetPageSourceResult() { return this.As(); } + public static ResultUnion FromPackets_GetPageSourceResult(Gamium.Protocol.Packets.GetPageSourceResultT _packets_getpagesourceresult) { return new ResultUnion{ Type = Result.Packets_GetPageSourceResult, Value = _packets_getpagesourceresult }; } public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, ResultUnion _o) { switch (_o.Type) { @@ -68,6 +71,7 @@ public static int Pack(Google.FlatBuffers.FlatBufferBuilder builder, ResultUnion case Result.Packets_DumpObjectsHierarchyResult: return Gamium.Protocol.Packets.DumpObjectsHierarchyResult.Pack(builder, _o.AsPackets_DumpObjectsHierarchyResult()).Value; case Result.Packets_ChangeConfigurationResult: return Gamium.Protocol.Packets.ChangeConfigurationResult.Pack(builder, _o.AsPackets_ChangeConfigurationResult()).Value; case Result.Packets_QueryProfileResult: return Gamium.Protocol.Packets.QueryProfileResult.Pack(builder, _o.AsPackets_QueryProfileResult()).Value; + case Result.Packets_GetPageSourceResult: return Gamium.Protocol.Packets.GetPageSourceResult.Pack(builder, _o.AsPackets_GetPageSourceResult()).Value; } } } diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs.meta index e6f220e3..d877debc 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Result.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3d7867b4f6b1425fb22bc0b953af206 +guid: 374a63143ea3945e8b9f6168e51a25d5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types.meta index 38478dca..4fb842e7 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e82f09cea5ef641719eae8161ac27fa3 +guid: 99a06663fe4a74bc7b92f5a96f02631e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Configuration.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Configuration.cs.meta index 01e0771e..7ce6762c 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Configuration.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Configuration.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b895f9b276ff4f4fbb5ea8338a141f9 +guid: fda38e748d1f74594baefb6c666ccfa9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorCode.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorCode.cs.meta index 7a331ad4..8f23cc64 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorCode.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorCode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fe976ffb0b53449da1482346b1c2d68 +guid: d08c31f06bd3b4d4a8da616e690c555f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorResult.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorResult.cs.meta index 8d05f5cc..c412ad58 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorResult.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ErrorResult.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdb7ef2b05f0a401a95057ac0f0004fa +guid: ee5a0e09cbfad41cc87c53c2e30b0c08 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ExecuteRpcBy.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ExecuteRpcBy.cs.meta index cf4618a9..142e2fb2 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ExecuteRpcBy.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ExecuteRpcBy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c94a5d0b39c04d8c9862cadfaecdd37 +guid: fa6d148a4a0ad4f00bd661b4a32f52eb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyBy.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyBy.cs.meta index f48b2372..0fed18a4 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyBy.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyBy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 638164ede5057456d9198d1f4c1af6ff +guid: dce98756547d241e4ae35dfd125443dc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyPressType.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyPressType.cs.meta index 6c19f732..04fed262 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyPressType.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputKeyPressType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3844a55f4d8c844eead4eb053d3fd6cf +guid: 0c2290c2ae9f14471aef830d4543960f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMouseButtonCode.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMouseButtonCode.cs.meta index 905219fb..48f3bf21 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMouseButtonCode.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMouseButtonCode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f47f7aa4d2b43435aa99cb2b30e3fea2 +guid: 08ac899ef6e784e4592284f0c8c6978b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMousePressType.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMousePressType.cs.meta index 624ee92d..59798952 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMousePressType.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/InputMousePressType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 313044c90baba411db4d6083a77b1cbc +guid: 9042e24cc834d4455922faf04f07bfdc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectHierarchyNode.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectHierarchyNode.cs.meta index 38dd13b1..494b15d7 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectHierarchyNode.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectHierarchyNode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3eedc7d34a2354fa2800a8a3abf451cf +guid: 01457aa38f64545f1abd104cf817a2d1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectInfo.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectInfo.cs.meta index 8f4f53d2..d8074394 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectInfo.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f48f9a8e80334fb6a01473f8f2eb555 +guid: 128976bafa52a4261b058fae22271641 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocator.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocator.cs.meta index c7c59e38..5ad35c7c 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocator.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocator.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2138972ee8fdf42ff9be9ef822abd0b4 +guid: 946a507a906224d5da3d04f0115a0bdc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocatorBy.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocatorBy.cs.meta index 13911b8f..9cdb2c6a 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocatorBy.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectLocatorBy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 314ba7d5f4b264fff9cda25c81f0f459 +guid: edb6927a61909445083b1afe47397f29 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectType.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectType.cs.meta index 4190336e..025e00a9 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectType.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49921b1f7fe494873bc098db7c82d263 +guid: a4512846696104e52a7e67917a65113b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectsHierarchy.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectsHierarchy.cs.meta index 4df817ab..64dc7e05 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectsHierarchy.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/ObjectsHierarchy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8adf0be652974f8bbccf203596e14a7 +guid: b21c67d53757d4213878c9daa6c3db8a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity.meta index 16ba60e8..89dec9a0 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc9db9ebeb105467a938b0368a7ef1cf +guid: c46f7477a9b6941e6aa01d0912941155 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyCode.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyCode.cs.meta index d8f7150f..95f6c188 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyCode.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyCode.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41c5d53f9328f4b269a97e258a06b16e +guid: 462b1833e5a074d10bccd0553490c2b1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyboard.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyboard.cs.meta index ca2ffaf6..20a21b91 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyboard.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Unity/UnityKeyboard.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d17d95b288d7c4a78af809608759f296 +guid: 3bf721ba01ac44afca08777168492234 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector2.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector2.cs.meta index ed900b7d..bcc33f70 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector2.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector2.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db7d481c338064e09b8677f36fa1becd +guid: 73c7ec174340f46498435be94f264339 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector3.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector3.cs.meta index bb993b29..d6b0881b 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector3.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector3.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29882cb39a8a84dcda2d0a5cf16a97ac +guid: e0bcf47e9366c4ed7ba3614fed1cfc90 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector4.cs.meta b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector4.cs.meta index 50ccb313..8dc49553 100644 --- a/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector4.cs.meta +++ b/engine/unity/Runtime/Public/Protocol/FlatBufferGenerated/Gamium/Protocol/Types/Vector4.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd5c463a58f67471db6a1b9a179b167a +guid: 99d35a90588134ab5bb8afaa0ff38877 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/package.json b/package.json index 97230bd7..73dc2fd1 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "scripts": { "build": "yarn workspaces foreach --exclude 'dogu' --jobs unlimited -ptvi run build", "clean": "yarn workspaces foreach --jobs unlimited -ptvi run clean", + "format": "yarn workspaces foreach --jobs unlimited -ptvi run format", "newbie": "yarn install && yarn newbie:husky", "newbie:husky": "husky install", "rebuild": "yarn clean && yarn build", - "test": "yarn workspaces foreach --jobs unlimited -ptvi run test", - "format": "yarn workspaces foreach --jobs unlimited -ptvi run format" + "test": "yarn workspaces foreach --jobs unlimited -ptvi run test" }, "workspaces": { "packages": [ @@ -31,7 +31,7 @@ }, "lint-staged": { "*.ts": [ - "prettier --write" + "prettier --write --editorconfig" ] }, "packageManager": "yarn@3.3.1" diff --git a/protocol/fbs/gamium/packets/inspector_packet.fbs b/protocol/fbs/gamium/packets/inspector_packet.fbs index 092688b8..f8ae82d6 100644 --- a/protocol/fbs/gamium/packets/inspector_packet.fbs +++ b/protocol/fbs/gamium/packets/inspector_packet.fbs @@ -29,4 +29,11 @@ table DumpObjectsHierarchyParam { table DumpObjectsHierarchyResult { hierarchies: [Types.ObjectsHierarchy] (native_inline); +} + +table GetPageSourceParam { +} + +table GetPageSourceResult { + page_source: string; } \ No newline at end of file diff --git a/protocol/fbs/gamium/request.fbs b/protocol/fbs/gamium/request.fbs index a1136487..5c2f9ffe 100644 --- a/protocol/fbs/gamium/request.fbs +++ b/protocol/fbs/gamium/request.fbs @@ -36,6 +36,8 @@ union Param { // profile Packets.QueryProfileParam, + + Packets.GetPageSourceParam, } table Request { diff --git a/protocol/fbs/gamium/response.fbs b/protocol/fbs/gamium/response.fbs index 78b4e7b3..cf8636ae 100644 --- a/protocol/fbs/gamium/response.fbs +++ b/protocol/fbs/gamium/response.fbs @@ -37,6 +37,8 @@ union Result { // profile Packets.QueryProfileResult, + + Packets.GetPageSourceResult, } table Response { diff --git a/utils/typescript/unity-meta-gen/UnityMock/UnityMock.sln b/utils/typescript/unity-meta-gen/UnityMock/UnityMock.sln index 9b892756..20b7eb5f 100644 --- a/utils/typescript/unity-meta-gen/UnityMock/UnityMock.sln +++ b/utils/typescript/unity-meta-gen/UnityMock/UnityMock.sln @@ -1,35 +1,203 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.TestRunner", "UnityEngine.TestRunner.csproj", "{28e9dc49-232e-fa2e-a983-d5c896653f63}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics", "Unity.Mathematics.csproj", "{7cedad75-9a17-7784-22d6-e8ce3dc57dfe}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.dogu.gamium.engine.unity.runtime", "com.dogu.gamium.engine.unity.runtime.csproj", "{ab099e1e-c4f1-3544-f3a4-5cb82fc6d076}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{d35448e7-d519-4c10-2866-1ac3c8850712}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.dogu.gamium.engine.unity.runtime.protocol", "com.dogu.gamium.engine.unity.runtime.protocol.csproj", "{25dfd808-f3d3-c578-82b7-6ff980385280}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.TextMeshPro.csproj", "{af8ef6fc-fb74-a333-d831-386c8b9a329e}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Animation.Runtime", "Unity.2D.Animation.Runtime.csproj", "{4782a328-f0c4-a3b4-57d0-98e05b12daa8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.IK.Runtime", "Unity.2D.IK.Runtime.csproj", "{90f323fb-19ea-2743-2d0d-1d747aac8740}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.SpriteShape.Runtime", "Unity.2D.SpriteShape.Runtime.csproj", "{9b14972d-04d5-4cf4-1156-3fe069be0992}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.PixelPerfect", "Unity.2D.PixelPerfect.csproj", "{f15b3041-f992-048c-b1ae-08097e6b070e}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Common.Runtime", "Unity.2D.Common.Runtime.csproj", "{c6a6621d-dca9-9751-0958-de6de64037ef}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.InternalAPIEngineBridge.001", "Unity.InternalAPIEngineBridge.001.csproj", "{bd6d2d00-298b-31c2-507b-196aae045cb2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Animation.Editor", "Unity.2D.Animation.Editor.csproj", "{03a03752-a1db-949d-bd4c-1555bc07865d}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "UnityEditor.TestRunner.csproj", "{59446826-6f43-58a1-34e9-24b269880a91}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.PlasticSCM.Editor", "Unity.PlasticSCM.Editor.csproj", "{8cd691c3-55f4-0212-ba8d-f713eb4cc4d4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Animation.Triangle.Editor", "Unity.2D.Animation.Triangle.Editor.csproj", "{32145d42-805f-f28c-31e3-d207b461d0ca}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{def5bbe5-b5e8-102b-696e-9de94b03e248}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VisualStudio.Editor", "Unity.VisualStudio.Editor.csproj", "{119265a3-cff1-f1a4-a892-ae1bbeebb3aa}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Psdimporter.Editor", "Unity.2D.Psdimporter.Editor.csproj", "{ed8f885c-b766-d573-edda-d1a6e4f5e373}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor", "Unity.TextMeshPro.Editor.csproj", "{fd1c74b3-f050-9eaf-f838-244e969a2f1f}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.SpriteShape.Editor", "Unity.2D.SpriteShape.Editor.csproj", "{21a3a285-69f0-434b-99c6-4ce845274d1c}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsdPlugin", "PsdPlugin.csproj", "{690a8b92-24a8-599f-6fd3-fe996b230055}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Path.Editor", "Unity.2D.Path.Editor.csproj", "{2f605f86-68cb-f122-ffc6-9ed340120ede}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{4a28171b-d038-69b8-dc1c-d2da3253cf1e}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.IK.Editor", "Unity.2D.IK.Editor.csproj", "{f177347c-5cb3-50e4-f1e0-8c19c88d7782}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.PixelPerfect.Editor", "Unity.2D.PixelPerfect.Editor.csproj", "{286df8ea-9eb4-08dc-c2db-6aa734fade40}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{ba46e591-2184-0ed8-762c-67124519dd99}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.dogu.gamium.engine.unity.editor", "com.dogu.gamium.engine.unity.editor.csproj", "{3f6772f2-e688-2d62-8b8a-8779c8b4e4e6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Common.Editor", "Unity.2D.Common.Editor.csproj", "{84de0781-d92b-952a-5fab-60d7be56b8ad}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics.Editor", "Unity.Mathematics.Editor.csproj", "{c1bfbbd2-140a-e351-9222-667c9fdd3a20}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.CollabProxy.Editor", "Unity.CollabProxy.Editor.csproj", "{8fe8e3fb-e56a-ab0a-4608-a3f2719ddb14}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.InternalAPIEditorBridge.001", "Unity.InternalAPIEditorBridge.001.csproj", "{9dd6f689-79ea-512d-398a-c00eaaf7776a}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{89c58a71-dfd2-7734-b8cb-8f7ae9d167dd}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.PixelPerfect.Tests", "Unity.2D.PixelPerfect.Tests.csproj", "{01480724-fad0-375e-6322-16887f7a4475}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mathematics.Tests", "Unity.Mathematics.Tests.csproj", "{9a20e7cc-ef32-44c0-d1c1-0bd7aaa5adc4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Nuget.NewtonsoftJson.Tests", "Unity.Nuget.NewtonsoftJson.Tests.csproj", "{9d2fc260-12b5-d746-0cdd-096daee03988}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Tests", "Unity.TextMeshPro.Tests.csproj", "{42f83a2f-6796-7175-154d-e1a36760c94b}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Path.Tests", "Unity.2D.Path.Tests.csproj", "{3b542886-3c51-5803-39fe-70044cbafea6}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.dogu.gamium.engine.unity.tests.runtime", "com.dogu.gamium.engine.unity.tests.runtime.csproj", "{f03d90f1-18b9-df5f-19be-2fa6dff75cc2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.SpriteShape.EditorTests", "Unity.2D.SpriteShape.EditorTests.csproj", "{2a19550b-f43f-3e60-f8e0-fc49b4053fe7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Common.EditorTests", "Unity.2D.Common.EditorTests.csproj", "{0b66512d-b4b9-80df-042e-4cbf801562e1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Psdimporter.EditorTests", "Unity.2D.Psdimporter.EditorTests.csproj", "{d3ee69d6-e2ce-a141-c96e-ba5343dcb426}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocCodeExamples", "DocCodeExamples.csproj", "{fa637dcf-7e2b-2285-c145-8f45f43cdff4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.PixelPerfect.Editor.Tests", "Unity.2D.PixelPerfect.Editor.Tests.csproj", "{8a73a701-814d-c013-5c30-ad5099b5ff98}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor.Tests", "Unity.TextMeshPro.Editor.Tests.csproj", "{3c75e071-8cb8-e3f9-cfa9-81f9db3ce3c6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Animation.EditorTests", "Unity.2D.Animation.EditorTests.csproj", "{797decb2-366e-74ea-abfc-34c0fa8c3b1c}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.dogu.gamium.engine.unity.tests.editor", "com.dogu.gamium.engine.unity.tests.editor.csproj", "{26121e19-e134-6de8-7791-73d34a34d673}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Nuget.NewtonsoftJson.EditorTests", "Unity.Nuget.NewtonsoftJson.EditorTests.csproj", "{2cffdd99-52cc-a3ff-e07d-0a1a5adbb637}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {28e9dc49-232e-fa2e-a983-d5c896653f63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28e9dc49-232e-fa2e-a983-d5c896653f63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7cedad75-9a17-7784-22d6-e8ce3dc57dfe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7cedad75-9a17-7784-22d6-e8ce3dc57dfe}.Debug|Any CPU.Build.0 = Debug|Any CPU {ab099e1e-c4f1-3544-f3a4-5cb82fc6d076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ab099e1e-c4f1-3544-f3a4-5cb82fc6d076}.Debug|Any CPU.Build.0 = Debug|Any CPU + {d35448e7-d519-4c10-2866-1ac3c8850712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {d35448e7-d519-4c10-2866-1ac3c8850712}.Debug|Any CPU.Build.0 = Debug|Any CPU {25dfd808-f3d3-c578-82b7-6ff980385280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25dfd808-f3d3-c578-82b7-6ff980385280}.Debug|Any CPU.Build.0 = Debug|Any CPU + {af8ef6fc-fb74-a333-d831-386c8b9a329e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {af8ef6fc-fb74-a333-d831-386c8b9a329e}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4782a328-f0c4-a3b4-57d0-98e05b12daa8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4782a328-f0c4-a3b4-57d0-98e05b12daa8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90f323fb-19ea-2743-2d0d-1d747aac8740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90f323fb-19ea-2743-2d0d-1d747aac8740}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9b14972d-04d5-4cf4-1156-3fe069be0992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9b14972d-04d5-4cf4-1156-3fe069be0992}.Debug|Any CPU.Build.0 = Debug|Any CPU + {f15b3041-f992-048c-b1ae-08097e6b070e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {f15b3041-f992-048c-b1ae-08097e6b070e}.Debug|Any CPU.Build.0 = Debug|Any CPU + {c6a6621d-dca9-9751-0958-de6de64037ef}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {c6a6621d-dca9-9751-0958-de6de64037ef}.Debug|Any CPU.Build.0 = Debug|Any CPU + {bd6d2d00-298b-31c2-507b-196aae045cb2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {bd6d2d00-298b-31c2-507b-196aae045cb2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03a03752-a1db-949d-bd4c-1555bc07865d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03a03752-a1db-949d-bd4c-1555bc07865d}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59446826-6f43-58a1-34e9-24b269880a91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59446826-6f43-58a1-34e9-24b269880a91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8cd691c3-55f4-0212-ba8d-f713eb4cc4d4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8cd691c3-55f4-0212-ba8d-f713eb4cc4d4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32145d42-805f-f28c-31e3-d207b461d0ca}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32145d42-805f-f28c-31e3-d207b461d0ca}.Debug|Any CPU.Build.0 = Debug|Any CPU + {def5bbe5-b5e8-102b-696e-9de94b03e248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {def5bbe5-b5e8-102b-696e-9de94b03e248}.Debug|Any CPU.Build.0 = Debug|Any CPU + {119265a3-cff1-f1a4-a892-ae1bbeebb3aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {119265a3-cff1-f1a4-a892-ae1bbeebb3aa}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ed8f885c-b766-d573-edda-d1a6e4f5e373}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ed8f885c-b766-d573-edda-d1a6e4f5e373}.Debug|Any CPU.Build.0 = Debug|Any CPU + {fd1c74b3-f050-9eaf-f838-244e969a2f1f}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {fd1c74b3-f050-9eaf-f838-244e969a2f1f}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21a3a285-69f0-434b-99c6-4ce845274d1c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21a3a285-69f0-434b-99c6-4ce845274d1c}.Debug|Any CPU.Build.0 = Debug|Any CPU + {690a8b92-24a8-599f-6fd3-fe996b230055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {690a8b92-24a8-599f-6fd3-fe996b230055}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2f605f86-68cb-f122-ffc6-9ed340120ede}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2f605f86-68cb-f122-ffc6-9ed340120ede}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4a28171b-d038-69b8-dc1c-d2da3253cf1e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4a28171b-d038-69b8-dc1c-d2da3253cf1e}.Debug|Any CPU.Build.0 = Debug|Any CPU + {f177347c-5cb3-50e4-f1e0-8c19c88d7782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {f177347c-5cb3-50e4-f1e0-8c19c88d7782}.Debug|Any CPU.Build.0 = Debug|Any CPU + {286df8ea-9eb4-08dc-c2db-6aa734fade40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {286df8ea-9eb4-08dc-c2db-6aa734fade40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ba46e591-2184-0ed8-762c-67124519dd99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ba46e591-2184-0ed8-762c-67124519dd99}.Debug|Any CPU.Build.0 = Debug|Any CPU {3f6772f2-e688-2d62-8b8a-8779c8b4e4e6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3f6772f2-e688-2d62-8b8a-8779c8b4e4e6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84de0781-d92b-952a-5fab-60d7be56b8ad}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84de0781-d92b-952a-5fab-60d7be56b8ad}.Debug|Any CPU.Build.0 = Debug|Any CPU + {c1bfbbd2-140a-e351-9222-667c9fdd3a20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {c1bfbbd2-140a-e351-9222-667c9fdd3a20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8fe8e3fb-e56a-ab0a-4608-a3f2719ddb14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8fe8e3fb-e56a-ab0a-4608-a3f2719ddb14}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9dd6f689-79ea-512d-398a-c00eaaf7776a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9dd6f689-79ea-512d-398a-c00eaaf7776a}.Debug|Any CPU.Build.0 = Debug|Any CPU {89c58a71-dfd2-7734-b8cb-8f7ae9d167dd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89c58a71-dfd2-7734-b8cb-8f7ae9d167dd}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01480724-fad0-375e-6322-16887f7a4475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01480724-fad0-375e-6322-16887f7a4475}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9a20e7cc-ef32-44c0-d1c1-0bd7aaa5adc4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9a20e7cc-ef32-44c0-d1c1-0bd7aaa5adc4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9d2fc260-12b5-d746-0cdd-096daee03988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9d2fc260-12b5-d746-0cdd-096daee03988}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42f83a2f-6796-7175-154d-e1a36760c94b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42f83a2f-6796-7175-154d-e1a36760c94b}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3b542886-3c51-5803-39fe-70044cbafea6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3b542886-3c51-5803-39fe-70044cbafea6}.Debug|Any CPU.Build.0 = Debug|Any CPU {f03d90f1-18b9-df5f-19be-2fa6dff75cc2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {f03d90f1-18b9-df5f-19be-2fa6dff75cc2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2a19550b-f43f-3e60-f8e0-fc49b4053fe7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2a19550b-f43f-3e60-f8e0-fc49b4053fe7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0b66512d-b4b9-80df-042e-4cbf801562e1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0b66512d-b4b9-80df-042e-4cbf801562e1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {d3ee69d6-e2ce-a141-c96e-ba5343dcb426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {d3ee69d6-e2ce-a141-c96e-ba5343dcb426}.Debug|Any CPU.Build.0 = Debug|Any CPU + {fa637dcf-7e2b-2285-c145-8f45f43cdff4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {fa637dcf-7e2b-2285-c145-8f45f43cdff4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8a73a701-814d-c013-5c30-ad5099b5ff98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8a73a701-814d-c013-5c30-ad5099b5ff98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3c75e071-8cb8-e3f9-cfa9-81f9db3ce3c6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3c75e071-8cb8-e3f9-cfa9-81f9db3ce3c6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {797decb2-366e-74ea-abfc-34c0fa8c3b1c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {797decb2-366e-74ea-abfc-34c0fa8c3b1c}.Debug|Any CPU.Build.0 = Debug|Any CPU {26121e19-e134-6de8-7791-73d34a34d673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {26121e19-e134-6de8-7791-73d34a34d673}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2cffdd99-52cc-a3ff-e07d-0a1a5adbb637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2cffdd99-52cc-a3ff-e07d-0a1a5adbb637}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE