conflict_resolution
stringlengths
27
16k
<<<<<<< import { Locations, PlayTypes } from '../Constants'; ======= import { Locations, Stages } from '../Constants'; >>>>>>> import { Locations, PlayTypes, Stages } from '../Constants'; <<<<<<< playType?: PlayTypes; ======= playCardTarget?: (context: AbilityContext, properties: PlayCardProperties) =>...
<<<<<<< vscode.commands.registerCommand( "webTemplateStudioExtension.wizardLaunch.local", async () => { //TODO: Modify this to support React Native Controller.getInstance(context, PLATFORM.WEB); } ), vscode.commands.registerCommand( "webTemplateStudioExtension.deployA...
<<<<<<< WEB_PROJECT_TYPE, RN_PROJECT_TYPE, ROUTE, REQUIREMENTS_DATA ======= REQUIREMENTS_DATA, >>>>>>> WEB_PROJECT_TYPE, RN_PROJECT_TYPE, ROUTE, REQUIREMENTS_DATA,
<<<<<<< const pages = [ { templateId: "wts.Page.React.Blank", name: "Blank", defaultName: "Blank", description: "A blank page for you to build your web application from scratch.", richDescription: "This is the most basic page. A blank canvas to mold into whatever you wish. The blank page lea...
<<<<<<< import dependencyInfo from "./dependencyInfo"; ======= import generationStatus from "./generationStatus/combineReducers"; >>>>>>> <<<<<<< versions, dependencyInfo ======= generationStatus, versions >>>>>>> versions <<<<<<< dependencyInfo: undefined, ======= generationStatus: unde...
<<<<<<< const methodName = "_onRequestWithOptions"; ======= let onRequestInnerMethodName = "_onRequestWithOpts"; if (compareVersionStrings(firebaseFunctionsResolution.version, "3.1.0") >= 0) { onRequestInnerMethodName = "_onRequestWithOptions"; } const onRequestMethodOriginal = httpsProvider[onRequestIn...
<<<<<<< spec: modsApi.ModSpec, newSpec: modsApi.ModSpec, currentParams: { [option: string]: string }, projectId: string ======= spec: extensionsApi.ExtensionSpec, newSpec: extensionsApi.ExtensionSpec, currentParams: { [option: string]: string } >>>>>>> spec: extensionsApi.ExtensionSpec, newSpec: ex...
<<<<<<< import { ordString } from '../src/Ord' ======= import { semigroupString } from '../src/Semigroup' >>>>>>> import { ordString } from '../src/Ord' import { semigroupString } from '../src/Semigroup'
<<<<<<< * * @example * cy.getFieldValue('Description').then(fieldValue => { ======= * * @example * cy.getStringFieldValue('Description').then(fieldValue => { >>>>>>> * * @example * cy.getStringFieldValue('Description').then(fieldValue => { <<<<<<< isChecked(fieldNa...
<<<<<<< import { SCHEMA_OPTIONS_SYMBOL, SchemaOptions, ValidatorError } from './morphism'; ======= import { SCHEMA_OPTIONS_SYMBOL, SchemaOptions } from "./morphism"; >>>>>>> import { SCHEMA_OPTIONS_SYMBOL, SchemaOptions, ValidatorError } from './morphism'; <<<<<<< export interface ActionSelector<Source = object, Ta...
<<<<<<< import { setCharacter } from './actions/save' import { ButtonState } from './GamepadManager' ======= import { testEmulator } from '../models/Emulator.mock' >>>>>>> import { setCharacter } from './actions/save' import { ButtonState } from './GamepadManager' import { testEmulator } from '../models/Emulator.moc...
<<<<<<< [stratName: string]: any; // Is this how to do it??????? } export interface googOptions { client_id:string; /*we do not supply this-----R*/ redirect_uri:string; /*we do not supply this-----R*/ response_type:string; /*we do not supply this-----R*/ scope:string; /*we do not supply this------R*/ clie...
<<<<<<< assertNotEquals, assertThrows, assertThrowsAsync, } from "https://deno.land/std@0.87.0/testing/asserts.ts"; ======= assertNotEquals } from "https://deno.land/std@0.87.0/testing/asserts.ts"; export { Base64 } from "https://deno.land/x/bb64/mod.ts"; >>>>>>> assertNotEquals, assertThrows, assertT...
<<<<<<< /** * import Authenticate from Authenticate.ts */ /***** Some person that wants to use Dashport, in their server file, they would ****** do below import { Dashport } from 'Our URL Here'; const dp = new Dashport('oak'); app.use(dp.initialize()) */ ======= import SessionManager from './sessionManager.ts'...
<<<<<<< locale_strings[1044] = "当前的 runtime 版本不支持视频播放,请使用最新的版本"; locale_strings[1045] = "没有设置要加载的资源地址"; ======= locale_strings[1043] = "{0} 中存在编译错误,属性名 : {1},属性值 : {2}"; locale_strings[1046] = "BitmapText 找不到对应字符:{0},请检查配置文件"; >>>>>>> locale_strings[1043] = "{0} 中存在编译错误,属性名 : {1},属性值 : {2}"; ...
<<<<<<< if (!this["navigator"]) { return true; ======= if (!window["navigator"]) { return true >>>>>>> if (!window["navigator"]) { return true; <<<<<<< // egret["testRuntimeType1"] = function () { // if (this["navigator"]) { // return true; // } // return fals...
<<<<<<< imageSourceWidth, imageSourceHeight, meshUVs, meshVertices, meshIndices, bounds); if (image["texture"] || (image.source && image.source["texture"])) { buffer.restoreTransform(); } ======= imageSourceWidth, imageSourceHeight, meshUVs, mes...
<<<<<<< ======= /// <reference path="../context/MainContext.ts"/> /// <reference path="../context/Ticker.ts"/> /// <reference path="Bitmap.ts"/> /// <reference path="DisplayObjectContainer.ts"/> /// <reference path="SpriteSheet.ts"/> /// <reference path="Texture.ts"/> /// <reference path="../utils/Logger.ts"/> >>>>...
<<<<<<< var maskBufferWidth = maskBuffer.width; var maskBufferHeight = maskBuffer.height; displayBuffer.drawTexture(<WebGLTexture><any>maskBuffer.rootRenderTarget.texture, 0, 0, maskBufferWidth, maskBufferHeight, ======= m...
<<<<<<< /// <reference path="../core/Geometry.ts"/> /// <reference path="../core/RenderFilter.ts"/> ======= >>>>>>> /// <reference path="../core/RenderFilter.ts"/> <<<<<<< draw(renderContext:RendererContext) { ======= visit(renderContext:RendererContext) { >>>>>>> draw(renderConte...
<<<<<<< ======= } declare namespace egret { type runEgretOptions = { renderMode?: string; audioType?: number; screenAdapter?: sys.IScreenAdapter; antialias?: boolean; canvasScaleFactor?: number; calculateCanvasScaleFactor?: (context: CanvasRenderingContext2D) => num...
<<<<<<< /** * * @example * <pre> * //获取动画数据 * var skeletonData = RES.getRes("skeleton"); * //获取纹理集数据 * var textureData = RES.getRes("textureConfig"); * //获取纹理集图片 * var texture = RES.getRes("texture"); * * //创建一个工厂,用来创建Armature * var factory:dragonBones.EgretFactor...
<<<<<<< { "v": "5.2.30", command: Upgrade_5_2_30 } ======= { "v": "5.2.25", command: Upgrade_5_2_25 } >>>>>>> { "v": "5.2.25", command: Upgrade_5_2_25 } <<<<<<< class Upgrade_5_2_30 { async execute() { file.copyAsync(path.join(egret.root, "tools", "templates", "empty...
<<<<<<< * 帧事件 * * @example * <pre> * private exampleEvent():void { //获取动画数据 var skeletonData = RES.getRes("skeleton"); //获取纹理集数据 var textureData = RES.getRes("textureConfig"); //获取纹理集图片 var texture = RES.getRes("texture"); //创建一个工厂,用来创建A...
<<<<<<< let displayList = displayObject.$displayList; if (displayList && !isStage) { if (displayObject.$cacheDirty || displayObject.$renderDirty) { ======= let filterPushed: boolean = false; if (displayList && !root) { if (displayList.isD...
<<<<<<< import {Chain, FakeChain} from '../chain'; ======= import {calculateChannelId} from './state-utils'; >>>>>>> import {Chain, FakeChain} from '../chain'; import {calculateChannelId} from './state-utils';
<<<<<<< if (display._DO_Privs_._cacheDirty || display._texture_to_render == null || bounds.width - display._texture_to_render._textureWidth > 1 || bounds.height - display._texture_to_render._textureHeight > 1) { ======= if (display._cacheDirty || display._textur...
<<<<<<< const amounts = [2, 3].map(bigNumberify); const outcome: Outcome = { type: 'SimpleEthAllocation', allocationItems: [ {destination: jointParticipants[0].destination, amount: amounts[0]}, {destination: jointParticipants[2].destination, amount: amounts[1]}, {destination: jointParticipants[1].destin...
<<<<<<< //todo 标记脏避免每次绘制到canvas if(!sharedCanvas) { sharedCanvas = createCanvas(); } var canvas = sharedCanvas; var context = canvas.getContext("2d"); canvas.width = this.surface.width; canvas.height = this.surface.heigh...
<<<<<<< var h:number = !isNaN(this.$TextField[sys.TextKeys.textFieldHeight]) ? this.$TextField[sys.TextKeys.textFieldHeight] : TextFieldUtils.$getTextHeight(this); ======= var h:number = !isNaN(this.$TextField[sys.TextKeys.textFieldHeight]) ? this.$TextField[sys.TextKeys.textFieldHeight] : Te...
<<<<<<< import {timerFactory} from '../metrics'; import {OnchainServiceInterface} from '../onchain-service'; ======= import {timerFactory, recordFunctionMetrics} from '../metrics'; >>>>>>> import {OnchainServiceInterface} from '../onchain-service'; import {timerFactory, recordFunctionMetrics} from '../metrics';
<<<<<<< /** * <div style="margin-top: 20px"><b>了解详细信息</b> * <a href="http://docs.egret-labs.org/jkdoc/manual-net-websocket.html" style="padding-left: 20px" target="_blank" >WebSocket</a> * </div> */ ======= /** * @class egret.WebSocket * @classdesc * egret.WebSocket 类启用代码以建立...
<<<<<<< ======= if (DEBUG) { egret.$markReadOnly(TextField, "numLines"); egret.$markReadOnly(TextField, "textWidth"); egret.$markReadOnly(TextField, "textHeight"); } export interface TextField{ addEventListener<Z>(type: "link" , listener: (this: Z, e: TextEvent...
<<<<<<< /** * * @example * <pre> * //获取动画数据 * var skeletonData = RES.getRes("skeleton"); * //获取纹理集数据 * var textureData = RES.getRes("textureConfig"); * //获取纹理集图片 * var texture = RES.getRes("texture"); * * //创建一个工厂,用来创建Armature * var factory:dragonBones.EgretFactor...
<<<<<<< import * as ContractAddressGenerator from '../../build/contracts/ContractAddressGenerator.json' import * as RLPEncode from '../../build/contracts/RLPEncode.json' import { Contract, ContractFactory, Wallet, utils } from 'ethers' ======= >>>>>>> import * as ContractAddressGenerator from '../../build/contracts/...
<<<<<<< /* Internal Imports */ import { rootPath } from '../index' const should = chai.should() const testArtifactsDir = path.join(rootPath, 'test', 'artifacts.test.tmp') const testRootPath = path.join(testArtifactsDir, (+new Date()).toString()) const dbRootPath = path.join(testRootPath, 'db') // If these directorie...
<<<<<<< const obj = await ClassRegistry.createInstance({classFullName: testEcClass.schema + "." + testEcClass.name, iModel: imodel}); ======= const {result: obj} = await ClassRegistry.createInstance({schemaName: testEcClass.schema, className: testEcClass.name, iModel: imodel}); >>>>>>> const {result: obj...
<<<<<<< import { dispose } from "@bentley/bentleyjs-core"; import { FeatureIndexType } from "@bentley/imodeljs-common"; ======= import { dispose, assert } from "@bentley/bentleyjs-core"; >>>>>>> import { dispose, assert } from "@bentley/bentleyjs-core"; import { FeatureIndexType } from "@bentley/imodeljs-common"; <...
<<<<<<< private getState(): State { return this._rootAsTree3d.getState(this.depth - 1); } /** Set the load state of the onwner attachment's array at this tile's depth. */ private setState(state: State) { this._rootAsTree3d.setState(this.depth - 1, state); } ======= private getState(): State { return t...
<<<<<<< // !!! TESTING METHOD public executeTestById(_iModelToken: IModelToken, _id: number, _params: any): any { return this.forward.apply(this, arguments); } ======= /** * Commit pending changes to this iModel * @param _description Optional description of the changes * @throws [[IModelError]]...
<<<<<<< const response = await this.iModel.executeQuery("SELECT * FROM [" + name[0] + "].[" + name[1] + "] WHERE Element.Id=" + this.id.toString()); // WIP: need to bind! if (response.error || !response.result) return Promise.reject(new IModelError(DgnDbStatus.SQLiteError)); const rows: any[] = JSON....
<<<<<<< import { FeatureMode, WithClipVolume } from "../TechniqueFlags"; import { GLSLFragment, addWhiteOnWhiteReversal, addPickBufferOutputs } from "./Fragment"; ======= import { FeatureMode } from "../TechniqueFlags"; import { GLSLFragment, addWhiteOnWhiteReversal } from "./Fragment"; >>>>>>> import { FeatureMode ...
<<<<<<< public requestSnap(activity: ActivityLoggingContext, connectionId: string, props: SnapRequestProps): Promise<SnapResponseProps> { activity.enter(); ======= public async requestSnap(actx: ActivityLoggingContext, connectionId: string, props: SnapRequestProps): Promise<SnapResponseProps> { actx.enter...
<<<<<<< private readonly _attributes = new Array<Attribute>(); ======= private readonly _attrMap?: Map<string, AttributeDetails>; private readonly _preserveShaderSourceCode: boolean; >>>>>>> private readonly _attrMap?: Map<string, AttributeDetails>;
<<<<<<< /** If true, requests for tile content will execute on a separate thread pool to avoid blocking other, less expensive asynchronous requests such as ECSql queries. * @internal */ ======= /** If true, requests for tile content will execute on a separate thread pool in order to avoid blocking other, le...
<<<<<<< /** Creates a change set file from the changes in a standalone iModel * @return Path to the standalone change set file * @internal */ public static createStandaloneChangeSet(iModelDb: IModelDb): ChangeSetToken { if (!iModelDb.isSnapshot && !iModelDb.isStandalone) { throw new IModelError(B...
<<<<<<< public get name() { return this._name; } public get url() { return this._tilesetUrl; } public tileTree(): TileTree | undefined { return this._tileTreeState.tileTree; } public loadStatus(): TileTree.LoadStatus { return this._tileTreeState.loadStatus; } ======= public get tileTree(): TileTree | undefi...
<<<<<<< import { Config, FileHandler } from ".."; ======= import { Config } from ".."; import { CustomRequestOptions } from "./CustomRequestOptions"; >>>>>>> import { Config, FileHandler } from ".."; import { CustomRequestOptions } from "./CustomRequestOptions"; <<<<<<< protected _agent: https.Agent; protected ...
<<<<<<< const haveOverrides = FeatureSymbologyOptions.None !== (opts & FeatureSymbologyOptions.HasOverrides); if (haveOverrides || System.instance.capabilities.supportsPickShaders) { // Pick shaders use feature index to look up element ID - otherwise it's not needed unless we need to look up overrides. addF...
<<<<<<< class RefreshTilesTool extends Tool { public static toolId = "RefreshTiles"; public static get maxArgs() { return undefined; } public run(changedModelIds?: string[]): boolean { IModelApp.viewManager.refreshForModifiedModels(changedModelIds); return true; } public parseAndRun(...args: string[...
<<<<<<< const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim"; ======= initialize(); const testIModelName: string = "assets/datasets/1K.bim"; >>>>>>> initialize(); const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim";
<<<<<<< import { Ray3d, Plane3dByOriginAndUnitNormal } from "@bentley/geometry-core/lib/AnalyticGeometry"; ======= import { GeometricModelState } from "./ModelState"; >>>>>>> import { Ray3d, Plane3dByOriginAndUnitNormal } from "@bentley/geometry-core/lib/AnalyticGeometry"; import { GeometricModelState } from "./Mode...
<<<<<<< const viewport = new Viewport(canvas, spatialView); const primBuilder = new PrimitiveBuilder(System.instance, GraphicType.Scene, viewport); ======= const viewport = new Viewport(viewDiv, spatialView); const gfParams = GraphicBuilderCreateParams.create(GraphicType.Scene, viewport); const pr...
<<<<<<< public async importSchema(schemaFileName: string): Promise<void> { if (!this.briefcase) throw this._newNotOpenError(); if (!this.briefcase.isStandalone) { await this.concurrencyControl.lockSchema(IModelDb.getAccessToken(this.iModelToken.iModelId!)); } const stat = this.briefcase.n...
<<<<<<< import { OpCodeReader, OpCodeWriter, OpCodeIterator, GeometryStreamBuilder, GeometryStream, OpCode } from "../../common/geometry/GeometryStream"; import { GeometryParams } from "../../common/geometry/GeometryProps"; ======= import { GSReader, GSWriter, GSCollection, GeometryBuilder, GeometryStream, OpCode } f...
<<<<<<< const iModels: HubIModel[] = await BriefcaseManager.imodelClient.IModels().get(adminAccessToken, testProjectId, new IModelQuery().byName(iModelName)); ======= const iModels: IModelRepository[] = await BriefcaseManager.hubClient.IModels().get(adminAccessToken, testProjectId, new IModelQuery().byName(iM...
<<<<<<< configuration.disableInstancing = undefined !== process.env.SVT_DISABLE_INSTANCING; configuration.useProjectExtents = undefined !== process.env.SVT_USE_PROJECT_EXTENTS; configuration.disableMagnification = undefined !== process.env.SVT_DISABLE_MAGNIFICATION; ======= if (undefined !== process.e...
<<<<<<< export abstract class DisplayStyleState extends ElementState { private _viewFlags: ViewFlags; private _background: ColorDef; private _monochrome: ColorDef; private _subCategoryOverrides: Map<string, SubCategoryOverride> = new Map<string, SubCategoryOverride>(); private _backgroundMap: BackgroundMapSta...
<<<<<<< export interface IElement extends IECInstance { ======= export interface ElementParams extends FullClassName { >>>>>>> export interface ElementParams extends IECInstance { <<<<<<< // When JSON.stringify'ing an element, don't include internal properties that begin with _ // One consequence of including such ...
<<<<<<< import { assert, Id64, BeTimePoint, IndexedValue, IDisposable, dispose } from "@bentley/bentleyjs-core"; import { IModelConnection } from "../../IModelConnection"; ======= import { assert, Id64, BeTimePoint, IndexedValue, IDisposable } from "@bentley/bentleyjs-core"; >>>>>>> import { assert, Id64, BeTimePoin...
<<<<<<< private static _uuidPattern = new RegExp("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"); private static _hexChars = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"]; private static _v4VariantChars = ["8", "9", "a", "b"]; ======= private static uuidPat...
<<<<<<< public readonly yAxisUp: boolean; protected readonly _childIds: string[]; protected _childrenLastUsed: BeTimePoint; protected _childrenLoadStatus: TileTree.LoadStatus; protected _children?: Tile[]; protected _contentRange?: ElementAlignedBox3d; protected _graphic?: RenderGraphic; protected _rang...
<<<<<<< ViewStateProps, IModelCoordinatesResponseProps, GeoCoordinatesResponseProps, PageOptions, kPagingDefaultOptions, PageableECSql, RpcPendingResponse, ======= ViewStateProps, IModelCoordinatesResponseProps, GeoCoordinatesResponseProps, QueryResponseStatus, QueryResponse, QueryPriority, QueryLimit, QueryQuota...
<<<<<<< import { AccessToken } from "@bentley/imodeljs-clients"; import { BriefcaseToken, BriefcaseManager, KeepBriefcase } from "./backend/BriefcaseManager"; import { OpenMode } from "@bentley/bentleyjs-core/lib/BeSQLite"; import { ECSqlStatement } from "./backend/ECSqlStatement"; ======= import { BriefcaseToken, Br...
<<<<<<< import { addClipping } from "./Clipping"; import { addHiliter } from "./FeatureSymbology"; ======= >>>>>>> import { addHiliter } from "./FeatureSymbology"; <<<<<<< export function createBuilder(clip: WithClipVolume): ProgramBuilder { ======= export function createPointCloudBuilder(): ProgramBuilder { >>...
<<<<<<< import { ClipVector, Transform } from "@bentley/geometry-core"; import { assert, Id64, IDisposable, dispose } from "@bentley/bentleyjs-core"; ======= import { ClipVector, Transform, Point2d, Range3d, Point3d } from "@bentley/geometry-core"; import { assert, Id64, IDisposable } from "@bentley/bentleyjs-core"; ...
<<<<<<< const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim"; ======= initialize(); const testIModelName: string = "assets/datasets/1K.bim"; >>>>>>> initialize(); const testIModelName: string = "assets/datasets/Properties_60InstancesWithUrl2.ibim"; <<<<<<< e...
<<<<<<< import { BackendIpc, BentleyStatus, HttpServerRequest, IModelError, IpcWebSocketBackend, MobileRpcConfiguration, MobileRpcGateway, MobileRpcProtocol, RpcMultipart, RpcSerializedValue } from "@bentley/imodeljs-common"; import * as ws from "ws"; import { MobileDevice } from "./MobileDevice"; ======= import { Be...
<<<<<<< import { FeatureMode, WithClipVolume } from "../TechniqueFlags"; import { GLSLFragment, addWhiteOnWhiteReversal, addPickBufferOutputs } from "./Fragment"; ======= import { FeatureMode } from "../TechniqueFlags"; import { GLSLFragment, addWhiteOnWhiteReversal } from "./Fragment"; >>>>>>> import { FeatureMode ...
<<<<<<< import { AccessToken, Code as HubCode, CodeState, CodeQuery } from "@bentley/imodeljs-clients"; import { NativeBriefcaseManagerResourcesRequest } from "@bentley/imodeljs-native-platform-api"; ======= import { AccessToken, DeploymentEnv, Code as HubCode, IModelHubClient, CodeState, CodeQuery, AzureFileHandler ...
<<<<<<< import { BriefcaseManager, KeepBriefcase } from "./BriefcaseManager"; import { IModelError, IModelStatus } from "../IModelError"; ======= import { BriefcaseManager, BriefcaseToken, KeepBriefcase } from "./BriefcaseManager"; >>>>>>> import { BriefcaseManager, BriefcaseToken, KeepBriefcase } from "./BriefcaseM...
<<<<<<< private _skipAttachments = true; // ###TODO: Remove after merge - bug fixed on master ======= public static get className() { return "SheetViewDefinition"; } public readonly sheetSize: Point2d; private _attachmentIds: Id64Array; private _attachments = new Attachments.AttachmentList(); private all...
<<<<<<< public abstract changeScene(scene: GraphicList, activeVolume?: RenderClipVolume): void; ======= public abstract changeScene(scene: GraphicList, activeVolume?: ClipVector): void; public abstract changeTerrain(_scene: GraphicList): void; >>>>>>> public abstract changeScene(scene: GraphicList, activeVol...
<<<<<<< const channelInfo = yield getChannelInfo(action.channelId); return jrs.success(action.id, {...channelInfo}); ======= const {channelId} = action; const channelStatus: ChannelState = yield select(getChannelStatus, channelId); const state = getLastState(channelStatus); const ...
<<<<<<< import { Id64Array, Id64String, Id64 } from "@bentley/bentleyjs-core"; import { BisCodeSpec, CategoryProps, CategorySelectorProps, ColorDef, CreateIModelProps, DefinitionElementProps, InformationPartitionElementProps, ModelSelectorProps, SubCategoryAppearance, SpatialViewDefinitionProps, ViewFlags, AnalysisStyl...
<<<<<<< ======= import { ElementPropertyFormatter } from "../ElementPropertyFormatter"; >>>>>>> import { ElementPropertyFormatter } from "../ElementPropertyFormatter"; <<<<<<< ======= it("ElementPropertyFormatter should format", async () => { const elements: Elements = imodel.elements; const code1 = new...
<<<<<<< public addMacro(macro: string): void { if (-1 === this._macros.indexOf(macro)) this._macros.push(macro); } ======= protected buildPreludeCommon(attrMap: Map<string, AttributeDetails> | undefined, isFrag: boolean = false, isLit: boolean = false, maxClippingPlanes: number = 0): SourceBuilder { ...
<<<<<<< import { IModelApp, IModelConnection, ViewState, Viewport, StandardViewId, ViewState3d, SpatialViewState, SpatialModelState, AccuDraw, PrimitiveTool, SnapMode, AccuSnap, NotificationManager, ToolTipOptions, NotifyMessageDetails } from "@bentley/imodeljs-frontend"; import { Target, FeatureSymbology } from "@bent...
<<<<<<< import { createPointCloudBuilder, createPointCloudHiliter } from "./glsl/PointCloud"; import { addElementId, addFeatureSymbology, addRenderOrder, computeElementId, computeUniformElementId, computeEyeSpace, FeatureSymbologyOptions } from "./glsl/FeatureSymbology"; import { GLSLFragment } from "./glsl/Fragment"; ...
<<<<<<< import { OpenMode, DbResult, Id64 } from "@bentley/bentleyjs-core"; import { AccessToken, ConnectClient, IModelHubClient, Project, IModelQuery, ChangeSet } from "@bentley/imodeljs-clients"; ======= import { OpenMode, DbResult, Id64, PerfLogger } from "@bentley/bentleyjs-core"; import { AccessToken, ChangeSet ...
<<<<<<< import { ClientRequestContext, Id64String, Logger } from "@bentley/bentleyjs-core"; import { IModelDb } from "@bentley/imodeljs-backend"; import { IModelRpcProps } from "@bentley/imodeljs-common"; import { ContentJSON, ContentRpcRequestOptions, Descriptor, DescriptorJSON, DescriptorOverrides, HierarchyRpcRequ...
<<<<<<< import { IElement, DefinitionElement } from "./Element"; ======= import { BisCore } from "./BisCore"; import { ElementParams, DefinitionElement } from "./Element"; >>>>>>> import { ElementParams, DefinitionElement } from "./Element"; <<<<<<< import { JsonUtils } from "@bentley/bentleyjs-core/lib/JsonUtils";...
<<<<<<< import { ToolCtor, Tool, ToolGroup } from "./tools/Tool"; import { I18N } from "./Localization"; ======= import { ToolCtor, Tool, ToolGroup, ImmediateTool } from "./tools/Tool"; >>>>>>> import { ToolCtor, Tool, ToolGroup, ImmediateTool } from "./tools/Tool"; import { I18N } from "./Localization"; <<<<<<< ...
<<<<<<< SET_INCOMPATIBLE_INTERFACE_VERSION: "setIncompatibleInterfaceVersion", RESTORE_COMPATIBLE_INTERFACE_VERSION: "restoreIncompatibleInterfaceVersion", ======= RESTART_BACKEND: "restartBackend", >>>>>>> SET_INCOMPATIBLE_INTERFACE_VERSION: "setIncompatibleInterfaceVersion", RESTORE_COMPATIBLE_INTERFACE_...
<<<<<<< public static getLocalizedName(): string { const namespace = this.group ? this.group.namespace : "tool"; return iModelApp.i18N.translate(namespace.concat(":", this.toolId)); } ======= public static getLocalizedName(): string { return this.toolId; } // NEEDS_WORK public static register(group: T...
<<<<<<< let gate: any = this._gates; ======= let gate = this.gates; >>>>>>> let gate = this._gates; <<<<<<< let gate: any = this._gates; ======= let gate = this.gates; >>>>>>> let gate = this._gates;
<<<<<<< import { IModelTestUtils, TestUsers, Timer } from "./IModelTestUtils"; import { BriefcaseManager, ChangeSetToken, KeepBriefcase, IModelDb, Element, DictionaryModel, SpatialCategory, IModelHost, AutoPush, AutoPushState, AutoPushEventHandler, AutoPushEventType } from "../backend"; ======= import { KeepBriefcase...
<<<<<<< import { iModelEngine } from "../IModelEngine"; import { AutoPush } from "../AutoPush"; let lastPushTimeMillis = 0; ======= import { iModelHost } from "../IModelHost"; >>>>>>> import { iModelHost } from "../IModelHost"; import { AutoPush } from "../AutoPush";
<<<<<<< constructor(schema: Schema, name: string, modifier?: ECClassModifier) { super(schema, name, modifier); this.key.type = SchemaChildType.RelationshipClass; ======= constructor(schema: Schema, name: string, strength?: StrengthType, strengthDirection?: RelatedInstanceDirection, modifier?: ECClassModi...
<<<<<<< const id: Id64String = ecdb.withPreparedStatement("INSERT INTO test.Foo(Struct) VALUES(?)", (stmt: ECSqlStatement) => { stmt.bindStruct(1, { bl: blobVal, bo: boolVal, d: doubleVal, dt: { type: ECSqlStringType.DateTime, value: dtVal }, i: intVal, p2d: p2dVal, p3d: p3dVal, s: stringVal }); ====...
<<<<<<< public nativeDb: any; private _classMetaDataRegistry: MetaDataRegistry; ======= private statementCache: ECSqlStatementCache = new ECSqlStatementCache(); private _maxStatementCacheCount = 20; private static _openDbMap: Map<string, IModelDb> = new Map<string, IModelDb>(); private _codeSpecs: CodeSpe...
<<<<<<< this._geom.composite!.update(flags); this.renderStencilVolumes(commands); ======= this._geometry.composite!.update(flags); >>>>>>> this._geom.composite!.update(flags); <<<<<<< const fboSet = this._frameBuffers.stencilSet; const fboCopy = this._frameBuffers.stencilCopy; =====...
<<<<<<< builder = context.createGraphicBuilder(GraphicType.WorldOverlay, transform); ======= graphic = context.createWorldOverlay(this.getDisplayTransform(vp)); >>>>>>> builder = context.createGraphicBuilder(GraphicType.WorldOverlay, this.getDisplayTransform(vp)); <<<<<<< builder.activateGraphic...
<<<<<<< MeshArgs, OnScreenTarget, GraphicType, Target, Decorations, Batch, WorldDecorations, TextureHandle, UpdatePlan, GraphicList, ======= MeshArgs, OnScreenTarget, GraphicBuilderCreateParams, GraphicType, Target, Decorations, Batch, DecorationList, WorldDecorations, TextureHandle, >>>>>>> MeshArgs, OnSc...
<<<<<<< import { ToolCtor, Tool, ToolGroup, ImmediateTool } from "./tools/Tool"; import { I18N } from "./Localization"; /** holds a mapping of toolId string to tool class */ export class ToolRegistry { public map: Map<string, ToolCtor> = new Map<string, ToolCtor>(); public unRegisterTool(toolId: string) { this.map...
<<<<<<< public constructor(public deploymentEnv: DeploymentEnv, fileHandler?: FileHandler, baseHandler: IModelServerHandler = new IModelHubBaseHandler(deploymentEnv)) { this._handler = baseHandler; this._fileHandler = fileHandler || this._handler.getFileHandler(); ======= public constructor(public deploym...
<<<<<<< QParams3d, QPoint3dList, ColorByName, GraphicParams, RenderMaterial, TextureMapping, SubCategoryOverride, ViewStateData, ======= QParams3d, QPoint3dList, ColorByName, GraphicParams, RenderMaterial, TextureMapping, SubCategoryOverride, SheetProps, ViewAttachmentProps, >>>>>>> QParams3d, QPoint3dList, Co...
<<<<<<< public async openForRead(_accessToken: AccessToken, _contextId: string, _iModelId: string, _version: IModelVersion): Promise<IModel> { ======= public async openForRead(_accessToken: AccessToken, _iModelToken: IModelToken): Promise<IModelGatewayOpenResponse> { >>>>>>> public async openForRead(_accessTok...
<<<<<<< import { TriMeshArgs, IndexedPolylineArgs, PolylineData, OctEncodedNormalList, QPoint3dList, MeshPolyline, MeshEdges, QParams3d, FeatureTable, FeatureIndex, FeatureIndexType } from "@bentley/imodeljs-common"; import { DisplayParams, DisplayParamsRegionEdgeType } from "./DisplayParams"; ======= import...
<<<<<<< import { IModelError, RenderTexture, RenderMaterial, Gradient, ImageBuffer, FeatureTable, ElementAlignedBox3d, ColorDef, QPoint3dList, QParams3d, QPoint3d } from "@bentley/imodeljs-common"; import { ClipVector, Transform, Point3d, ClipUtilities, PolyfaceBuilder, Point2d, IndexedPolyface, Range3d, IndexedPolyfac...