Skip to content
This repository has been archived by the owner on Jun 10, 2022. It is now read-only.

Jabenk/physics merge1 #658

Merged
merged 4 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/functional-tests/src/tests/user-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import { Test } from '../test';
export default class UserTest extends Test {
public expectedResultDescription = "Lists user info";
public async run(root: MRE.Actor): Promise<boolean> {
const connectedUserCount = Object.keys(this.app.connectedUsers).length;
const labelText = 'Launched by User Named: ' + this.user.name +
'\nUser ID: ' + this.user.id +
"\nPermissions: " + this.user.grantedPermissions.join(", ") +
"\nProperties: " + this.formatProperties(this.user.properties) +
"\nTotal Connected Users:" + connectedUserCount;
"\nTotal Connected Users:" + this.app.context.users.length;

MRE.Actor.Create(this.app.context, {
actor: {
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk/src/actor/behaviors/targetBehavior.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {
ActionState,
BehaviorType,
DiscreteAction,
User
User,
Vector3Like
} from '../..';
// break import cycle
import { Behavior } from './behavior';
import { Vector3Like } from '@microsoft/mixed-reality-extension-common/src';

/**
* Interface that represents a point in space as a local space point and an app space point.
Expand Down