Merge branch 'master' of https://github.com/specklesystems/Server
This commit is contained in:
Dimitrie Stefanescu
+4
-8
@@ -1,17 +1,13 @@
|
||||
.circleci
|
||||
node_modules
|
||||
**/node_modules
|
||||
**/dist
|
||||
test-queries
|
||||
.editorconfig
|
||||
.gitignore
|
||||
.git
|
||||
Contributing.md
|
||||
ISSUE_TEMPLATE.md
|
||||
lerna.json
|
||||
LICENSE
|
||||
package-lock.json
|
||||
package.json
|
||||
**/.env
|
||||
.env.example
|
||||
.eslintrc.json
|
||||
.mocharc.js
|
||||
readme.md
|
||||
.env
|
||||
readme.md
|
||||
+4
-3
@@ -1,11 +1,12 @@
|
||||
packages/server/node_modules
|
||||
*node_modules
|
||||
packages/server/.env
|
||||
packages/frontend/node_modules
|
||||
packages/frontend/dist
|
||||
packages/viewer/node_modules
|
||||
packages/viewer/dist
|
||||
*.env
|
||||
.nyc_output
|
||||
coverage/
|
||||
.vscode
|
||||
test-queries
|
||||
|
||||
**/.DS_Store
|
||||
.nvmrc
|
||||
|
||||
+17
-6
@@ -1,14 +1,23 @@
|
||||
FROM node:12.20.1-alpine3.12@sha256:42998ae4420998ff3255fc2d6884e882bd32f06d45b057f4b042e33bf48a1240 as build
|
||||
FROM node:14.15.4-alpine3.12@sha256:55bf28ea11b18fd914e1242835ea3299ec76f5a034e8c6e42b2ede70064e338c as node
|
||||
|
||||
FROM node as build
|
||||
# Having multiple steps in builder doesn't increase the final image size
|
||||
# So having verbose steps for readability and caching should be the target
|
||||
|
||||
WORKDIR /opt
|
||||
WORKDIR /opt/viewer
|
||||
COPY packages/viewer/package*.json ./
|
||||
RUN npm install
|
||||
COPY packages/viewer .
|
||||
RUN npm run build
|
||||
|
||||
WORKDIR /opt/frontend
|
||||
# Copy package defs first they are the least likely to change
|
||||
# Keeping this order will least likely trigger full rebuild
|
||||
COPY packages/frontend/package*.json frontend/
|
||||
RUN npm --prefix frontend ci frontend
|
||||
COPY packages/frontend/package*.json ./
|
||||
RUN npm install ../viewer
|
||||
RUN npm ci
|
||||
|
||||
WORKDIR /opt
|
||||
COPY packages/server/package*.json server/
|
||||
ENV NODE_ENV production
|
||||
RUN npm --prefix server ci server
|
||||
@@ -21,9 +30,11 @@ COPY packages/frontend frontend
|
||||
WORKDIR /opt/frontend
|
||||
RUN npm run build
|
||||
|
||||
FROM node:12.20.1-alpine3.12@sha256:42998ae4420998ff3255fc2d6884e882bd32f06d45b057f4b042e33bf48a1240
|
||||
FROM node as runtime
|
||||
|
||||
RUN apk add --no-cache tini=0.19.0-r0
|
||||
ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.3/wait /wait
|
||||
RUN chmod +x /wait
|
||||
|
||||
# Use a non-root user for increased security.
|
||||
USER node
|
||||
@@ -45,4 +56,4 @@ COPY --chown=node packages/server /home/node/server
|
||||
# Init for containers https://github.com/krallin/tini
|
||||
ENTRYPOINT [ "/sbin/tini", "--" ]
|
||||
|
||||
CMD ["node", "bin/www"]
|
||||
CMD /wait && node bin/www
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
version: "3"
|
||||
services:
|
||||
server:
|
||||
build:
|
||||
.
|
||||
depends_on:
|
||||
- database
|
||||
- redis
|
||||
ports:
|
||||
- "3000:3000"
|
||||
environment:
|
||||
DEBUG: "speckle:*"
|
||||
WAIT_HOSTS: database:5432, redis:6379
|
||||
env_file:
|
||||
- .env
|
||||
|
||||
database:
|
||||
image: "postgres:13.1-alpine" # use the current alpine version for smaller image
|
||||
environment:
|
||||
POSTGRES_DB:
|
||||
POSTGRES_USER:
|
||||
POSTGRES_PASSWORD:
|
||||
volumes:
|
||||
# persist data even if container shuts down
|
||||
- speckle-postgres-data:/var/lib/postgresql/data/
|
||||
ports:
|
||||
- "5432:5432"
|
||||
|
||||
pgadmin:
|
||||
image: dpage/pgadmin4
|
||||
environment:
|
||||
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
|
||||
PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
|
||||
ports:
|
||||
- "16543:80"
|
||||
depends_on:
|
||||
- database
|
||||
|
||||
redis:
|
||||
image: "redis:6.0-alpine"
|
||||
ports:
|
||||
- "6379:6379" # It is not neccesary to expose the reddis port if running the app with compose
|
||||
volumes:
|
||||
- redis_volume_data:/data
|
||||
|
||||
redis_insight:
|
||||
image: redislabs/redisinsight:latest
|
||||
container_name: redis_insight
|
||||
restart: always
|
||||
depends_on:
|
||||
- redis
|
||||
ports:
|
||||
- 8001:8001
|
||||
volumes:
|
||||
- redis_insight_volume_data:/db
|
||||
|
||||
volumes:
|
||||
speckle-postgres-data: # named volumes can be managed easier using docker-compose
|
||||
redis_volume_data:
|
||||
redis_insight_volume_data:
|
||||
@@ -14,8 +14,12 @@ Notes:
|
||||
|
||||
## Project setup
|
||||
|
||||
The frontend now includes the viewer. Until we get to publish it as a separate module, there's a few extra steps:
|
||||
|
||||
First, make sure you build the [Speckle Viewer](../viewer). Afterwards, run
|
||||
|
||||
```
|
||||
npm install
|
||||
lerna bootstrap
|
||||
```
|
||||
|
||||
### Compiles and hot-reloads for development
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
<template>
|
||||
<div v-if="user" style="display: inline-block" class="text-center">
|
||||
<v-avatar class="ma-1" color="grey lighten-3" :size="size">
|
||||
<v-img v-if="user.avatar" :src="user.avatar" />
|
||||
<v-img v-else :src="`https://robohash.org/` + id + `.png?size=40x40`" />
|
||||
</v-avatar>
|
||||
<p class="text-h6 mt-4">
|
||||
{{ user.name }}
|
||||
<br />
|
||||
<a class="text-body-2" @click="signOut">Not you? Switch accounts.</a>
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { signOut } from '@/auth-helpers'
|
||||
import userQuery from '../graphql/userById.gql'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
size: {
|
||||
type: Number,
|
||||
default: 42
|
||||
},
|
||||
id: {
|
||||
type: String,
|
||||
default: () => localStorage.getItem('uuid')
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
isSelf() {
|
||||
return this.id === localStorage.getItem('uuid')
|
||||
},
|
||||
loggedInUserId() {
|
||||
return localStorage.getItem('uuid')
|
||||
}
|
||||
},
|
||||
apollo: {
|
||||
user: {
|
||||
query: userQuery,
|
||||
variables() {
|
||||
return {
|
||||
id: this.id
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
signOut() {
|
||||
signOut()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<v-card v-if="!$apollo.loading && action === 0" rounded="lg" class="py-4 elevation-10">
|
||||
<v-card v-if="!$apollo.loading && action === 0" rounded="lg" class="pb-4 elevation-10">
|
||||
<v-card-text class="text-center background2">
|
||||
<user-avatar></user-avatar>
|
||||
</v-card-text>
|
||||
<v-card-text class="text-h5 font-weight-regular text-center pt-10">
|
||||
<v-icon v-if="app.trustByDefault" class="mr-2 primary--text">mdi-shield-check</v-icon>
|
||||
<b class="primary--text">{{ app.name }}</b>
|
||||
@@ -64,7 +67,7 @@
|
||||
</template>
|
||||
<script>
|
||||
import gql from 'graphql-tag'
|
||||
import UserAvatar from '../../components/UserAvatar'
|
||||
import UserAvatar from '../../components/UserAvatarAuthoriseApp'
|
||||
|
||||
export default {
|
||||
name: 'AuthorizeApp',
|
||||
@@ -107,6 +110,9 @@ export default {
|
||||
computed: {
|
||||
denyUrl() {
|
||||
return `${this.app.redirectUrl}?denied=true`
|
||||
},
|
||||
selfUserId() {
|
||||
return localStorage.getItem('uuid')
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
@@ -1,31 +1,48 @@
|
||||
#########################################################vvv
|
||||
###########################################################
|
||||
# Basics
|
||||
# The following env vars are expected to exist.
|
||||
# Fill them in here, or make sure you provide them via
|
||||
# your deployment environment.
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
PORT=3000
|
||||
POSTGRES_URL="postgres://localhost/speckle2"
|
||||
# for `docker-compose up` use "redis://redis"
|
||||
REDIS_URL="redis://localhost:6379"
|
||||
|
||||
CANONICAL_URL="http://localhost:3000"
|
||||
SESSION_SECRET="-> FILL IN <-"
|
||||
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
# Postgres Database
|
||||
# the connection uri is build up from these variables
|
||||
############################################################
|
||||
# only include the address, the protocoll `postgres://` is provided.
|
||||
# for local development a sensible default is "localhost"
|
||||
# if the app is ran via `docker-compose up`, it has to be the name of the service.
|
||||
# this defaults to "database"
|
||||
POSTGRES_URL="-> FILL IN <-"
|
||||
# this overrides the default root user in the postgres instance
|
||||
POSTGRES_USER="-> FILL IN <-"
|
||||
# this sets the root user password in the postgres instance
|
||||
POSTGRES_PASSWORD="-> FILL IN <-"
|
||||
# this overrides the default database name in postgres
|
||||
POSTGRES_DB="-> FILL IN <-"
|
||||
|
||||
############################################################
|
||||
# Emails
|
||||
# Optional.
|
||||
#########################################################vvv
|
||||
SMTP_HOST="-> FILL IN <-"
|
||||
SMTP_PORT=587
|
||||
SMPT_USERNAME="-> FILL IN <-"
|
||||
SMPT_PASSWORD="-> FILL IN <-"
|
||||
############################################################
|
||||
# SMTP_HOST="-> FILL IN <-"
|
||||
# SMTP_PORT=587
|
||||
# SMPT_USERNAME="-> FILL IN <-"
|
||||
# SMPT_PASSWORD="-> FILL IN <-"
|
||||
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
# Auth strategies
|
||||
# At least one needs to be enabled!
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
STRATEGY_LOCAL=true
|
||||
|
||||
# STRATEGY_GITHUB=false
|
||||
# STRATEGY_GITHUB=true
|
||||
# GITHUB_CLIENT_ID="-> FILL IN <-"
|
||||
# GITHUB_CLIENT_SECRET="-> FILL IN <-"
|
||||
|
||||
@@ -34,16 +51,15 @@ STRATEGY_LOCAL=true
|
||||
# GOOGLE_CLIENT_SECRET="-> FILL IN <-"
|
||||
|
||||
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
# Tracing & co.
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
# SENTRY_DSN="-> FILL IN <-"
|
||||
TELEMETRY=true
|
||||
|
||||
#########################################################vvv
|
||||
############################################################
|
||||
# Local dev environments
|
||||
# If your frontend is served in dev from somewhere else,
|
||||
# this is going to help out :)
|
||||
#########################################################vvv
|
||||
# FRONTEND_PORT=8081
|
||||
|
||||
############################################################
|
||||
# FRONTEND_PORT=8081
|
||||
@@ -128,7 +128,7 @@ exports.startHttp = async ( app ) => {
|
||||
app.use( Sentry.Handlers.errorHandler( ) )
|
||||
|
||||
server.on( 'listening', ( ) => {
|
||||
debug( 'speckle:startup' )( `🚀 My name is Spockle Server, and I'm running at ${server.address().port}` )
|
||||
debug( 'speckle:startup' )( `🚀 My name is Speckle Server, and I'm running at ${server.address().port}` )
|
||||
} )
|
||||
|
||||
server.listen( port )
|
||||
|
||||
@@ -26,24 +26,35 @@ function walk( dir ) {
|
||||
|
||||
let migrationDirs = walk( './modules' )
|
||||
|
||||
// this is for readability, many users struggle to set the postgres connection uri
|
||||
// in the env variables. This way its a bit easier to understand, also backward compatible.
|
||||
let env = process.env
|
||||
let connectionUri
|
||||
if ( env.POSTGRES_USER && env.POSTGRES_PASSWORD ) {
|
||||
connectionUri = `postgres://${env.POSTGRES_USER}:${env.POSTGRES_PASSWORD}` +
|
||||
`@${env.POSTGRES_URL}/${env.POSTGRES_DB}`
|
||||
} else {
|
||||
connectionUri = env.POSTGRES_URL
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
test: {
|
||||
client: 'pg',
|
||||
connection: 'postgres://localhost/speckle2_test',
|
||||
connection: connectionUri || 'postgres://localhost/speckle2_test',
|
||||
migrations: {
|
||||
directory: migrationDirs
|
||||
},
|
||||
},
|
||||
development: {
|
||||
client: 'pg',
|
||||
connection: process.env.POSTGRES_URL || 'postgres://localhost/speckle2_dev',
|
||||
connection: connectionUri || 'postgres://localhost/speckle2_dev',
|
||||
migrations: {
|
||||
directory: migrationDirs
|
||||
},
|
||||
},
|
||||
production: {
|
||||
client: 'pg',
|
||||
connection: process.env.POSTGRES_URL,
|
||||
connection: connectionUri,
|
||||
migrations: {
|
||||
directory: migrationDirs
|
||||
}
|
||||
|
||||
Generated
+15
-28
@@ -9978,30 +9978,17 @@
|
||||
"dev": true
|
||||
},
|
||||
"pg": {
|
||||
"version": "7.18.2",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
|
||||
"integrity": "sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==",
|
||||
"version": "8.5.1",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz",
|
||||
"integrity": "sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==",
|
||||
"requires": {
|
||||
"buffer-writer": "2.0.0",
|
||||
"packet-reader": "1.0.0",
|
||||
"pg-connection-string": "0.1.3",
|
||||
"pg-packet-stream": "^1.1.0",
|
||||
"pg-pool": "^2.0.10",
|
||||
"pg-connection-string": "^2.4.0",
|
||||
"pg-pool": "^3.2.2",
|
||||
"pg-protocol": "^1.4.0",
|
||||
"pg-types": "^2.1.0",
|
||||
"pgpass": "1.x",
|
||||
"semver": "4.3.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"pg-connection-string": {
|
||||
"version": "0.1.3",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
|
||||
"integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
|
||||
},
|
||||
"semver": {
|
||||
"version": "4.3.2",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
|
||||
"integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
|
||||
}
|
||||
"pgpass": "1.x"
|
||||
}
|
||||
},
|
||||
"pg-connection-string": {
|
||||
@@ -10019,15 +10006,15 @@
|
||||
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
|
||||
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
|
||||
},
|
||||
"pg-packet-stream": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
|
||||
"integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
|
||||
},
|
||||
"pg-pool": {
|
||||
"version": "2.0.10",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
|
||||
"integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="
|
||||
"version": "3.2.2",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
|
||||
"integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="
|
||||
},
|
||||
"pg-protocol": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz",
|
||||
"integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="
|
||||
},
|
||||
"pg-query-stream": {
|
||||
"version": "3.4.2",
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
"passport-github2": "^0.1.12",
|
||||
"passport-google-oauth2": "^0.2.0",
|
||||
"passport-google-oauth20": "^2.0.0",
|
||||
"pg": "^7.18.2",
|
||||
"pg": "^8.5.1",
|
||||
"pg-query-stream": "^3.4.2",
|
||||
"redis": "^3.0.2",
|
||||
"zxcvbn": "^4.4.2"
|
||||
|
||||
@@ -12,7 +12,7 @@ We're working to stabilize the 2.0 API, and until then there will be breaking ch
|
||||
|
||||
## Introduction
|
||||
|
||||
The Speckle Server is a node application. To start it locally:
|
||||
The Speckle Server is a node application tested against v12. To start it locally:
|
||||
|
||||
First, ensure you have postgres and redis ready and running:
|
||||
|
||||
|
||||
Vendored
+1
File diff suppressed because one or more lines are too long
+793
-21
@@ -228,7 +228,7 @@ var v = new _modules_Viewer__WEBPACK_IMPORTED_MODULE_0__.default({
|
||||
});
|
||||
v.on('load-progress', args => console.log(args));
|
||||
window.v = v;
|
||||
var token = 'e844747dc6f6b0b5c7d5fbd82d66de6e9529531d75';
|
||||
var token = '72b3da65eb21cb211f9d79fc1d12ef3699fc47e6f0';
|
||||
|
||||
window.LoadData = /*#__PURE__*/function () {
|
||||
var _LoadData = _asyncToGenerator(function* (url) {
|
||||
@@ -314,8 +314,10 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export */ "default": () => /* binding */ Coverter
|
||||
/* harmony export */ });
|
||||
/* harmony import */ var three__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! three */ "./node_modules/three/build/three.module.js");
|
||||
/* harmony import */ var _ObjectWrapper__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ObjectWrapper */ "./src/modules/ObjectWrapper.js");
|
||||
/* harmony import */ var _Units__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Units */ "./src/modules/Units.js");
|
||||
/* harmony import */ var three_examples_jsm_curves_NURBSCurve__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! three/examples/jsm/curves/NURBSCurve */ "./node_modules/three/examples/jsm/curves/NURBSCurve.js");
|
||||
/* harmony import */ var three_examples_jsm_curves_NURBSUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! three/examples/jsm/curves/NURBSUtils */ "./node_modules/three/examples/jsm/curves/NURBSUtils.js");
|
||||
/* harmony import */ var _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ObjectWrapper */ "./src/modules/ObjectWrapper.js");
|
||||
/* harmony import */ var _Units__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Units */ "./src/modules/Units.js");
|
||||
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
||||
|
||||
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
||||
@@ -329,6 +331,9 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Utility class providing some top level conversion methods.
|
||||
*/
|
||||
@@ -389,7 +394,7 @@ var Coverter = /*#__PURE__*/function () {
|
||||
callback(yield this[type + "ToBufferGeometry"](obj.data || obj));
|
||||
return;
|
||||
} catch (e) {
|
||||
console.warn("(Traversing - direct) Failed to convert " + type + " with id: " + obj.id);
|
||||
console.warn("(Traversing - direct) Failed to convert " + type + " with id: " + obj.id, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -405,10 +410,10 @@ var Coverter = /*#__PURE__*/function () {
|
||||
var {
|
||||
bufferGeometry
|
||||
} = yield this.convert(displayValue);
|
||||
callback(new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_1__.default(bufferGeometry, obj)); // use the parent's metadata!
|
||||
callback(new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(bufferGeometry, obj)); // use the parent's metadata!
|
||||
// return // returning here is faster but excludes objects that have a display value and displayable children (ie, a wall with windows)
|
||||
} catch (e) {
|
||||
console.warn("(Traversing) Failed to convert obj with id: " + obj.id);
|
||||
console.warn("(Traversing) Failed to convert obj with id: " + obj.id + " \u2014 " + e.message);
|
||||
}
|
||||
} // Last attempt: iterate through all object keys and see if we can display anything!
|
||||
// traverses the object in case there's any sub-objects we can convert.
|
||||
@@ -548,7 +553,7 @@ var Coverter = /*#__PURE__*/function () {
|
||||
delete obj.Curve3D;
|
||||
delete obj.Surfaces;
|
||||
delete obj.Vertices;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_1__.default(bufferGeometry, obj);
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(bufferGeometry, obj);
|
||||
} catch (e) {
|
||||
console.warn("Failed to convert brep id: " + obj.id);
|
||||
throw e;
|
||||
@@ -567,7 +572,7 @@ var Coverter = /*#__PURE__*/function () {
|
||||
var _MeshToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
try {
|
||||
if (!obj) return;
|
||||
var conversionFactor = (0,_Units__WEBPACK_IMPORTED_MODULE_2__.getConversionFactor)(obj.units); // console.log( conversionFactor )
|
||||
var conversionFactor = (0,_Units__WEBPACK_IMPORTED_MODULE_4__.getConversionFactor)(obj.units); // console.log( conversionFactor )
|
||||
|
||||
var buffer = new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry();
|
||||
var indices = [];
|
||||
@@ -595,7 +600,7 @@ var Coverter = /*#__PURE__*/function () {
|
||||
buffer.computeBoundingSphere();
|
||||
delete obj.vertices;
|
||||
delete obj.faces;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_1__.default(buffer, obj);
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(buffer, obj);
|
||||
} catch (e) {
|
||||
console.warn("Failed to convert mesh with id: " + obj.id);
|
||||
throw e;
|
||||
@@ -608,15 +613,187 @@ var Coverter = /*#__PURE__*/function () {
|
||||
|
||||
return MeshToBufferGeometry;
|
||||
}() // TODOs:
|
||||
// async PointToBufferGeometry( obj ) {}
|
||||
// async LineToBufferGeometry( obj ) {}
|
||||
// async PolylineToBufferGeometry( obj ) {}
|
||||
// async PolycurveToBufferGeometry( obj ) {}
|
||||
// async CurveToBufferGeometry( obj ) {}
|
||||
// async CircleToBufferGeometry( obj ) {}
|
||||
// async ArcToBufferGeometry( obj ) {}
|
||||
// async EllipseToBufferGeometry( obj ) {}
|
||||
// async SurfaceToBufferGeometry( obj ) {}
|
||||
|
||||
}, {
|
||||
key: "PointToBufferGeometry",
|
||||
value: function () {
|
||||
var _PointToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
var conversionFactor = (0,_Units__WEBPACK_IMPORTED_MODULE_4__.getConversionFactor)(obj.units);
|
||||
var v = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.value[0] * conversionFactor, obj.value[1] * conversionFactor, obj.value[2] * conversionFactor);
|
||||
var buf = new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry().setFromPoints([v]);
|
||||
delete obj.value;
|
||||
delete obj.speckle_type;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(buf, obj, 'point');
|
||||
});
|
||||
|
||||
function PointToBufferGeometry(_x8) {
|
||||
return _PointToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return PointToBufferGeometry;
|
||||
}()
|
||||
}, {
|
||||
key: "LineToBufferGeometry",
|
||||
value: function () {
|
||||
var _LineToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
return this.PolylineToBufferGeometry(obj);
|
||||
});
|
||||
|
||||
function LineToBufferGeometry(_x9) {
|
||||
return _LineToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return LineToBufferGeometry;
|
||||
}()
|
||||
}, {
|
||||
key: "PolylineToBufferGeometry",
|
||||
value: function () {
|
||||
var _PolylineToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
var conversionFactor = (0,_Units__WEBPACK_IMPORTED_MODULE_4__.getConversionFactor)(obj.units);
|
||||
var points = [];
|
||||
|
||||
for (var i = 0; i < obj.value.length; i += 3) {
|
||||
points.push(new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.value[i] * conversionFactor, obj.value[i + 1] * conversionFactor, obj.value[i + 2] * conversionFactor));
|
||||
}
|
||||
|
||||
var geometry = new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry().setFromPoints(points);
|
||||
delete obj.value;
|
||||
delete obj.speckle_type;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(geometry, obj, 'line');
|
||||
});
|
||||
|
||||
function PolylineToBufferGeometry(_x10) {
|
||||
return _PolylineToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return PolylineToBufferGeometry;
|
||||
}() // async PolycurveToBufferGeometry( obj ) {}
|
||||
|
||||
}, {
|
||||
key: "CurveToBufferGeometry",
|
||||
value: function () {
|
||||
var _CurveToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
try {
|
||||
console.log('Curve to buffer', obj);
|
||||
var conversionFactor = (0,_Units__WEBPACK_IMPORTED_MODULE_4__.getConversionFactor)(obj.units); // Convert points+weights to Vector4
|
||||
|
||||
var points = [];
|
||||
|
||||
for (var i = 0; i < obj.points.length; i += 3) {
|
||||
points.push(new three__WEBPACK_IMPORTED_MODULE_0__.Vector4(obj.points[i] * conversionFactor, obj.points[i + 1] * conversionFactor, obj.points[i + 2] * conversionFactor, obj.weights[i / 3] * conversionFactor));
|
||||
} // Convert knots from rhino compact format to normal format.
|
||||
|
||||
|
||||
var knots = [obj.knots[0]];
|
||||
knots = knots.concat(obj.knots);
|
||||
knots.push(knots[knots.length - 1]); // Create the nurbs curve
|
||||
|
||||
var curve = new three_examples_jsm_curves_NURBSCurve__WEBPACK_IMPORTED_MODULE_1__.NURBSCurve(obj.degree, knots, points, null, null); // Delete everything unnecessary from the metadata object.
|
||||
|
||||
delete obj.speckle_type;
|
||||
delete obj.displayValue;
|
||||
delete obj.points;
|
||||
delete obj.weights;
|
||||
delete obj.knots; // Compute appropriate curve subdivisions
|
||||
|
||||
var div = curve.getLength() / 0.1;
|
||||
div = parseInt(div.toString());
|
||||
if (div < 20) div = 20;
|
||||
if (div > 4000) div = 4000; // Divide the nurbs curve in points
|
||||
|
||||
var pts = curve.getPoints(div);
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry().setFromPoints(pts), obj, 'line');
|
||||
} catch (e) {
|
||||
console.warn('Error converting nurbs curve, falling back to displayValue', obj);
|
||||
var poly = yield this.PolylineToBufferGeometry(obj.displayValue);
|
||||
delete obj.speckle_type;
|
||||
delete obj.displayValue;
|
||||
delete obj.points;
|
||||
delete obj.weights;
|
||||
delete obj.knots;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(poly.bufferGeometry, obj, 'line');
|
||||
}
|
||||
});
|
||||
|
||||
function CurveToBufferGeometry(_x11) {
|
||||
return _CurveToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return CurveToBufferGeometry;
|
||||
}()
|
||||
}, {
|
||||
key: "CircleToBufferGeometry",
|
||||
value: function () {
|
||||
var _CircleToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
console.log('circle to buffer', obj);
|
||||
var center = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.origin.value[0], obj.plane.origin.value[1], obj.plane.origin.value[2]);
|
||||
var xAxis = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.xdir.value[0], obj.plane.xdir.value[1], obj.plane.xdir.value[2]);
|
||||
var yAxis = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.ydir.value[0], obj.plane.ydir.value[1], obj.plane.ydir.value[2]);
|
||||
console.log(center, xAxis, yAxis);
|
||||
var resolution = 2 * Math.PI * obj.radius / 0.1;
|
||||
resolution = parseInt(resolution.toString());
|
||||
var points = [];
|
||||
|
||||
for (var index = 0; index <= resolution; index++) {
|
||||
var t = index * Math.PI * 2 / resolution;
|
||||
var x = Math.cos(t) * obj.radius;
|
||||
var y = Math.sin(t) * obj.radius;
|
||||
var xMove = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(xAxis.x * x, xAxis.y * x, xAxis.z * x);
|
||||
var yMove = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(yAxis.x * y, yAxis.y * y, yAxis.z * y);
|
||||
var pt = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3().addVectors(xMove, yMove).add(center);
|
||||
points.push(pt);
|
||||
}
|
||||
|
||||
console.log(points);
|
||||
var geometry = new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry().setFromPoints(points);
|
||||
delete obj.value;
|
||||
delete obj.speckle_type;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(geometry, obj, 'line');
|
||||
});
|
||||
|
||||
function CircleToBufferGeometry(_x12) {
|
||||
return _CircleToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return CircleToBufferGeometry;
|
||||
}() // async ArcToBufferGeometry( obj ) {}
|
||||
|
||||
}, {
|
||||
key: "EllipseToBufferGeometry",
|
||||
value: function () {
|
||||
var _EllipseToBufferGeometry = _asyncToGenerator(function* (obj) {
|
||||
console.log('ellipse to buffer', obj);
|
||||
var center = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.origin.value[0], obj.plane.origin.value[1], obj.plane.origin.value[2]);
|
||||
var xAxis = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.xdir.value[0], obj.plane.xdir.value[1], obj.plane.xdir.value[2]);
|
||||
var yAxis = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(obj.plane.ydir.value[0], obj.plane.ydir.value[1], obj.plane.ydir.value[2]);
|
||||
console.log(center, xAxis, yAxis);
|
||||
var resolution = 2 * Math.PI * obj.radius / 0.1;
|
||||
resolution = parseInt(resolution.toString());
|
||||
var points = [];
|
||||
|
||||
for (var index = 0; index <= resolution; index++) {
|
||||
var t = index * Math.PI * 2 / resolution;
|
||||
var x = Math.cos(t) * obj.radius1;
|
||||
var y = Math.sin(t) * obj.radius2;
|
||||
var xMove = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(xAxis.x * x, xAxis.y * x, xAxis.z * x);
|
||||
var yMove = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3(yAxis.x * y, yAxis.y * y, yAxis.z * y);
|
||||
var pt = new three__WEBPACK_IMPORTED_MODULE_0__.Vector3().addVectors(xMove, yMove).add(center);
|
||||
points.push(pt);
|
||||
}
|
||||
|
||||
console.log(points);
|
||||
var geometry = new three__WEBPACK_IMPORTED_MODULE_0__.BufferGeometry().setFromPoints(points);
|
||||
delete obj.value;
|
||||
delete obj.speckle_type;
|
||||
return new _ObjectWrapper__WEBPACK_IMPORTED_MODULE_3__.default(geometry, obj, 'line');
|
||||
});
|
||||
|
||||
function EllipseToBufferGeometry(_x13) {
|
||||
return _EllipseToBufferGeometry.apply(this, arguments);
|
||||
}
|
||||
|
||||
return EllipseToBufferGeometry;
|
||||
}() // async SurfaceToBufferGeometry( obj ) {}
|
||||
|
||||
}]);
|
||||
|
||||
@@ -971,6 +1148,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Manages objects and provides some convenience methods to focus on the entire scene, or one specific object.
|
||||
*/
|
||||
@@ -1008,8 +1186,15 @@ var SceneObjectManager = /*#__PURE__*/function () {
|
||||
transparent: true,
|
||||
opacity: 0.4,
|
||||
envMap: this.viewer.cubeCamera.renderTarget.texture
|
||||
}); // this.lineMaterial = new
|
||||
|
||||
});
|
||||
this.lineMaterial = new three__WEBPACK_IMPORTED_MODULE_0__.LineBasicMaterial({
|
||||
color: 0x000000
|
||||
});
|
||||
this.pointMaterial = new three__WEBPACK_IMPORTED_MODULE_0__.PointsMaterial({
|
||||
size: 10,
|
||||
sizeAttenuation: false,
|
||||
color: 0x000000
|
||||
});
|
||||
this.objectIds = [];
|
||||
this.postLoad = lodash_debounce__WEBPACK_IMPORTED_MODULE_1___default()(() => {
|
||||
this._postLoadFunction();
|
||||
@@ -1100,10 +1285,19 @@ var SceneObjectManager = /*#__PURE__*/function () {
|
||||
key: "addLine",
|
||||
value: function addLine(wrapper) {
|
||||
var line = new three__WEBPACK_IMPORTED_MODULE_0__.Line(wrapper.bufferGeometry, this.lineMaterial);
|
||||
line.userData = wrapper.meta;
|
||||
line.uuid = wrapper.meta.id;
|
||||
this.objectIds.push(line.uuid);
|
||||
this.solidObjects.add(line);
|
||||
}
|
||||
}, {
|
||||
key: "addPoint",
|
||||
value: function addPoint(wrapper) {// TODO
|
||||
value: function addPoint(wrapper) {
|
||||
var dot = new three__WEBPACK_IMPORTED_MODULE_0__.Points(wrapper.bufferGeometry, this.pointMaterial);
|
||||
dot.userData = wrapper.meta;
|
||||
dot.uuid = wrapper.meta.id;
|
||||
this.objectIds.push(dot.uuid);
|
||||
this.solidObjects.add(dot);
|
||||
}
|
||||
}, {
|
||||
key: "removeObject",
|
||||
@@ -65406,6 +65600,584 @@ TransformControlsPlane.prototype = Object.assign( Object.create( _build_three_mo
|
||||
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ "./node_modules/three/examples/jsm/curves/NURBSCurve.js":
|
||||
/*!**************************************************************!*\
|
||||
!*** ./node_modules/three/examples/jsm/curves/NURBSCurve.js ***!
|
||||
\**************************************************************/
|
||||
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
||||
/* harmony export */ "NURBSCurve": () => /* binding */ NURBSCurve
|
||||
/* harmony export */ });
|
||||
/* harmony import */ var _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../build/three.module.js */ "./node_modules/three/build/three.module.js");
|
||||
/* harmony import */ var _curves_NURBSUtils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../curves/NURBSUtils.js */ "./node_modules/three/examples/jsm/curves/NURBSUtils.js");
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* NURBS curve object
|
||||
*
|
||||
* Derives from Curve, overriding getPoint and getTangent.
|
||||
*
|
||||
* Implementation is based on (x, y [, z=0 [, w=1]]) control points with w=weight.
|
||||
*
|
||||
**/
|
||||
|
||||
var NURBSCurve = function ( degree, knots /* array of reals */, controlPoints /* array of Vector(2|3|4) */, startKnot /* index in knots */, endKnot /* index in knots */ ) {
|
||||
|
||||
_build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Curve.call( this );
|
||||
|
||||
this.degree = degree;
|
||||
this.knots = knots;
|
||||
this.controlPoints = [];
|
||||
// Used by periodic NURBS to remove hidden spans
|
||||
this.startKnot = startKnot || 0;
|
||||
this.endKnot = endKnot || ( this.knots.length - 1 );
|
||||
for ( var i = 0; i < controlPoints.length; ++ i ) {
|
||||
|
||||
// ensure Vector4 for control points
|
||||
var point = controlPoints[ i ];
|
||||
this.controlPoints[ i ] = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector4( point.x, point.y, point.z, point.w );
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
NURBSCurve.prototype = Object.create( _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Curve.prototype );
|
||||
NURBSCurve.prototype.constructor = NURBSCurve;
|
||||
|
||||
|
||||
NURBSCurve.prototype.getPoint = function ( t, optionalTarget ) {
|
||||
|
||||
var point = optionalTarget || new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector3();
|
||||
|
||||
var u = this.knots[ this.startKnot ] + t * ( this.knots[ this.endKnot ] - this.knots[ this.startKnot ] ); // linear mapping t->u
|
||||
|
||||
// following results in (wx, wy, wz, w) homogeneous point
|
||||
var hpoint = _curves_NURBSUtils_js__WEBPACK_IMPORTED_MODULE_1__.NURBSUtils.calcBSplinePoint( this.degree, this.knots, this.controlPoints, u );
|
||||
|
||||
if ( hpoint.w != 1.0 ) {
|
||||
|
||||
// project to 3D space: (wx, wy, wz, w) -> (x, y, z, 1)
|
||||
hpoint.divideScalar( hpoint.w );
|
||||
|
||||
}
|
||||
|
||||
return point.set( hpoint.x, hpoint.y, hpoint.z );
|
||||
|
||||
};
|
||||
|
||||
|
||||
NURBSCurve.prototype.getTangent = function ( t, optionalTarget ) {
|
||||
|
||||
var tangent = optionalTarget || new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector3();
|
||||
|
||||
var u = this.knots[ 0 ] + t * ( this.knots[ this.knots.length - 1 ] - this.knots[ 0 ] );
|
||||
var ders = _curves_NURBSUtils_js__WEBPACK_IMPORTED_MODULE_1__.NURBSUtils.calcNURBSDerivatives( this.degree, this.knots, this.controlPoints, u, 1 );
|
||||
tangent.copy( ders[ 1 ] ).normalize();
|
||||
|
||||
return tangent;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ "./node_modules/three/examples/jsm/curves/NURBSUtils.js":
|
||||
/*!**************************************************************!*\
|
||||
!*** ./node_modules/three/examples/jsm/curves/NURBSUtils.js ***!
|
||||
\**************************************************************/
|
||||
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
||||
/* harmony export */ "NURBSUtils": () => /* binding */ NURBSUtils
|
||||
/* harmony export */ });
|
||||
/* harmony import */ var _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../build/three.module.js */ "./node_modules/three/build/three.module.js");
|
||||
|
||||
|
||||
/**
|
||||
* NURBS utils
|
||||
*
|
||||
* See NURBSCurve and NURBSSurface.
|
||||
**/
|
||||
|
||||
|
||||
/**************************************************************
|
||||
* NURBS Utils
|
||||
**************************************************************/
|
||||
|
||||
var NURBSUtils = {
|
||||
|
||||
/*
|
||||
Finds knot vector span.
|
||||
|
||||
p : degree
|
||||
u : parametric value
|
||||
U : knot vector
|
||||
|
||||
returns the span
|
||||
*/
|
||||
findSpan: function ( p, u, U ) {
|
||||
|
||||
var n = U.length - p - 1;
|
||||
|
||||
if ( u >= U[ n ] ) {
|
||||
|
||||
return n - 1;
|
||||
|
||||
}
|
||||
|
||||
if ( u <= U[ p ] ) {
|
||||
|
||||
return p;
|
||||
|
||||
}
|
||||
|
||||
var low = p;
|
||||
var high = n;
|
||||
var mid = Math.floor( ( low + high ) / 2 );
|
||||
|
||||
while ( u < U[ mid ] || u >= U[ mid + 1 ] ) {
|
||||
|
||||
if ( u < U[ mid ] ) {
|
||||
|
||||
high = mid;
|
||||
|
||||
} else {
|
||||
|
||||
low = mid;
|
||||
|
||||
}
|
||||
|
||||
mid = Math.floor( ( low + high ) / 2 );
|
||||
|
||||
}
|
||||
|
||||
return mid;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate basis functions. See The NURBS Book, page 70, algorithm A2.2
|
||||
|
||||
span : span in which u lies
|
||||
u : parametric point
|
||||
p : degree
|
||||
U : knot vector
|
||||
|
||||
returns array[p+1] with basis functions values.
|
||||
*/
|
||||
calcBasisFunctions: function ( span, u, p, U ) {
|
||||
|
||||
var N = [];
|
||||
var left = [];
|
||||
var right = [];
|
||||
N[ 0 ] = 1.0;
|
||||
|
||||
for ( var j = 1; j <= p; ++ j ) {
|
||||
|
||||
left[ j ] = u - U[ span + 1 - j ];
|
||||
right[ j ] = U[ span + j ] - u;
|
||||
|
||||
var saved = 0.0;
|
||||
|
||||
for ( var r = 0; r < j; ++ r ) {
|
||||
|
||||
var rv = right[ r + 1 ];
|
||||
var lv = left[ j - r ];
|
||||
var temp = N[ r ] / ( rv + lv );
|
||||
N[ r ] = saved + rv * temp;
|
||||
saved = lv * temp;
|
||||
|
||||
}
|
||||
|
||||
N[ j ] = saved;
|
||||
|
||||
}
|
||||
|
||||
return N;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate B-Spline curve points. See The NURBS Book, page 82, algorithm A3.1.
|
||||
|
||||
p : degree of B-Spline
|
||||
U : knot vector
|
||||
P : control points (x, y, z, w)
|
||||
u : parametric point
|
||||
|
||||
returns point for given u
|
||||
*/
|
||||
calcBSplinePoint: function ( p, U, P, u ) {
|
||||
|
||||
var span = this.findSpan( p, u, U );
|
||||
var N = this.calcBasisFunctions( span, u, p, U );
|
||||
var C = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector4( 0, 0, 0, 0 );
|
||||
|
||||
for ( var j = 0; j <= p; ++ j ) {
|
||||
|
||||
var point = P[ span - p + j ];
|
||||
var Nj = N[ j ];
|
||||
var wNj = point.w * Nj;
|
||||
C.x += point.x * wNj;
|
||||
C.y += point.y * wNj;
|
||||
C.z += point.z * wNj;
|
||||
C.w += point.w * Nj;
|
||||
|
||||
}
|
||||
|
||||
return C;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate basis functions derivatives. See The NURBS Book, page 72, algorithm A2.3.
|
||||
|
||||
span : span in which u lies
|
||||
u : parametric point
|
||||
p : degree
|
||||
n : number of derivatives to calculate
|
||||
U : knot vector
|
||||
|
||||
returns array[n+1][p+1] with basis functions derivatives
|
||||
*/
|
||||
calcBasisFunctionDerivatives: function ( span, u, p, n, U ) {
|
||||
|
||||
var zeroArr = [];
|
||||
for ( var i = 0; i <= p; ++ i )
|
||||
zeroArr[ i ] = 0.0;
|
||||
|
||||
var ders = [];
|
||||
for ( var i = 0; i <= n; ++ i )
|
||||
ders[ i ] = zeroArr.slice( 0 );
|
||||
|
||||
var ndu = [];
|
||||
for ( var i = 0; i <= p; ++ i )
|
||||
ndu[ i ] = zeroArr.slice( 0 );
|
||||
|
||||
ndu[ 0 ][ 0 ] = 1.0;
|
||||
|
||||
var left = zeroArr.slice( 0 );
|
||||
var right = zeroArr.slice( 0 );
|
||||
|
||||
for ( var j = 1; j <= p; ++ j ) {
|
||||
|
||||
left[ j ] = u - U[ span + 1 - j ];
|
||||
right[ j ] = U[ span + j ] - u;
|
||||
|
||||
var saved = 0.0;
|
||||
|
||||
for ( var r = 0; r < j; ++ r ) {
|
||||
|
||||
var rv = right[ r + 1 ];
|
||||
var lv = left[ j - r ];
|
||||
ndu[ j ][ r ] = rv + lv;
|
||||
|
||||
var temp = ndu[ r ][ j - 1 ] / ndu[ j ][ r ];
|
||||
ndu[ r ][ j ] = saved + rv * temp;
|
||||
saved = lv * temp;
|
||||
|
||||
}
|
||||
|
||||
ndu[ j ][ j ] = saved;
|
||||
|
||||
}
|
||||
|
||||
for ( var j = 0; j <= p; ++ j ) {
|
||||
|
||||
ders[ 0 ][ j ] = ndu[ j ][ p ];
|
||||
|
||||
}
|
||||
|
||||
for ( var r = 0; r <= p; ++ r ) {
|
||||
|
||||
var s1 = 0;
|
||||
var s2 = 1;
|
||||
|
||||
var a = [];
|
||||
for ( var i = 0; i <= p; ++ i ) {
|
||||
|
||||
a[ i ] = zeroArr.slice( 0 );
|
||||
|
||||
}
|
||||
|
||||
a[ 0 ][ 0 ] = 1.0;
|
||||
|
||||
for ( var k = 1; k <= n; ++ k ) {
|
||||
|
||||
var d = 0.0;
|
||||
var rk = r - k;
|
||||
var pk = p - k;
|
||||
|
||||
if ( r >= k ) {
|
||||
|
||||
a[ s2 ][ 0 ] = a[ s1 ][ 0 ] / ndu[ pk + 1 ][ rk ];
|
||||
d = a[ s2 ][ 0 ] * ndu[ rk ][ pk ];
|
||||
|
||||
}
|
||||
|
||||
var j1 = ( rk >= - 1 ) ? 1 : - rk;
|
||||
var j2 = ( r - 1 <= pk ) ? k - 1 : p - r;
|
||||
|
||||
for ( var j = j1; j <= j2; ++ j ) {
|
||||
|
||||
a[ s2 ][ j ] = ( a[ s1 ][ j ] - a[ s1 ][ j - 1 ] ) / ndu[ pk + 1 ][ rk + j ];
|
||||
d += a[ s2 ][ j ] * ndu[ rk + j ][ pk ];
|
||||
|
||||
}
|
||||
|
||||
if ( r <= pk ) {
|
||||
|
||||
a[ s2 ][ k ] = - a[ s1 ][ k - 1 ] / ndu[ pk + 1 ][ r ];
|
||||
d += a[ s2 ][ k ] * ndu[ r ][ pk ];
|
||||
|
||||
}
|
||||
|
||||
ders[ k ][ r ] = d;
|
||||
|
||||
var j = s1;
|
||||
s1 = s2;
|
||||
s2 = j;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var r = p;
|
||||
|
||||
for ( var k = 1; k <= n; ++ k ) {
|
||||
|
||||
for ( var j = 0; j <= p; ++ j ) {
|
||||
|
||||
ders[ k ][ j ] *= r;
|
||||
|
||||
}
|
||||
|
||||
r *= p - k;
|
||||
|
||||
}
|
||||
|
||||
return ders;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate derivatives of a B-Spline. See The NURBS Book, page 93, algorithm A3.2.
|
||||
|
||||
p : degree
|
||||
U : knot vector
|
||||
P : control points
|
||||
u : Parametric points
|
||||
nd : number of derivatives
|
||||
|
||||
returns array[d+1] with derivatives
|
||||
*/
|
||||
calcBSplineDerivatives: function ( p, U, P, u, nd ) {
|
||||
|
||||
var du = nd < p ? nd : p;
|
||||
var CK = [];
|
||||
var span = this.findSpan( p, u, U );
|
||||
var nders = this.calcBasisFunctionDerivatives( span, u, p, du, U );
|
||||
var Pw = [];
|
||||
|
||||
for ( var i = 0; i < P.length; ++ i ) {
|
||||
|
||||
var point = P[ i ].clone();
|
||||
var w = point.w;
|
||||
|
||||
point.x *= w;
|
||||
point.y *= w;
|
||||
point.z *= w;
|
||||
|
||||
Pw[ i ] = point;
|
||||
|
||||
}
|
||||
|
||||
for ( var k = 0; k <= du; ++ k ) {
|
||||
|
||||
var point = Pw[ span - p ].clone().multiplyScalar( nders[ k ][ 0 ] );
|
||||
|
||||
for ( var j = 1; j <= p; ++ j ) {
|
||||
|
||||
point.add( Pw[ span - p + j ].clone().multiplyScalar( nders[ k ][ j ] ) );
|
||||
|
||||
}
|
||||
|
||||
CK[ k ] = point;
|
||||
|
||||
}
|
||||
|
||||
for ( var k = du + 1; k <= nd + 1; ++ k ) {
|
||||
|
||||
CK[ k ] = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector4( 0, 0, 0 );
|
||||
|
||||
}
|
||||
|
||||
return CK;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate "K over I"
|
||||
|
||||
returns k!/(i!(k-i)!)
|
||||
*/
|
||||
calcKoverI: function ( k, i ) {
|
||||
|
||||
var nom = 1;
|
||||
|
||||
for ( var j = 2; j <= k; ++ j ) {
|
||||
|
||||
nom *= j;
|
||||
|
||||
}
|
||||
|
||||
var denom = 1;
|
||||
|
||||
for ( var j = 2; j <= i; ++ j ) {
|
||||
|
||||
denom *= j;
|
||||
|
||||
}
|
||||
|
||||
for ( var j = 2; j <= k - i; ++ j ) {
|
||||
|
||||
denom *= j;
|
||||
|
||||
}
|
||||
|
||||
return nom / denom;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate derivatives (0-nd) of rational curve. See The NURBS Book, page 127, algorithm A4.2.
|
||||
|
||||
Pders : result of function calcBSplineDerivatives
|
||||
|
||||
returns array with derivatives for rational curve.
|
||||
*/
|
||||
calcRationalCurveDerivatives: function ( Pders ) {
|
||||
|
||||
var nd = Pders.length;
|
||||
var Aders = [];
|
||||
var wders = [];
|
||||
|
||||
for ( var i = 0; i < nd; ++ i ) {
|
||||
|
||||
var point = Pders[ i ];
|
||||
Aders[ i ] = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector3( point.x, point.y, point.z );
|
||||
wders[ i ] = point.w;
|
||||
|
||||
}
|
||||
|
||||
var CK = [];
|
||||
|
||||
for ( var k = 0; k < nd; ++ k ) {
|
||||
|
||||
var v = Aders[ k ].clone();
|
||||
|
||||
for ( var i = 1; i <= k; ++ i ) {
|
||||
|
||||
v.sub( CK[ k - i ].clone().multiplyScalar( this.calcKoverI( k, i ) * wders[ i ] ) );
|
||||
|
||||
}
|
||||
|
||||
CK[ k ] = v.divideScalar( wders[ 0 ] );
|
||||
|
||||
}
|
||||
|
||||
return CK;
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate NURBS curve derivatives. See The NURBS Book, page 127, algorithm A4.2.
|
||||
|
||||
p : degree
|
||||
U : knot vector
|
||||
P : control points in homogeneous space
|
||||
u : parametric points
|
||||
nd : number of derivatives
|
||||
|
||||
returns array with derivatives.
|
||||
*/
|
||||
calcNURBSDerivatives: function ( p, U, P, u, nd ) {
|
||||
|
||||
var Pders = this.calcBSplineDerivatives( p, U, P, u, nd );
|
||||
return this.calcRationalCurveDerivatives( Pders );
|
||||
|
||||
},
|
||||
|
||||
|
||||
/*
|
||||
Calculate rational B-Spline surface point. See The NURBS Book, page 134, algorithm A4.3.
|
||||
|
||||
p1, p2 : degrees of B-Spline surface
|
||||
U1, U2 : knot vectors
|
||||
P : control points (x, y, z, w)
|
||||
u, v : parametric values
|
||||
|
||||
returns point for given (u, v)
|
||||
*/
|
||||
calcSurfacePoint: function ( p, q, U, V, P, u, v, target ) {
|
||||
|
||||
var uspan = this.findSpan( p, u, U );
|
||||
var vspan = this.findSpan( q, v, V );
|
||||
var Nu = this.calcBasisFunctions( uspan, u, p, U );
|
||||
var Nv = this.calcBasisFunctions( vspan, v, q, V );
|
||||
var temp = [];
|
||||
|
||||
for ( var l = 0; l <= q; ++ l ) {
|
||||
|
||||
temp[ l ] = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector4( 0, 0, 0, 0 );
|
||||
for ( var k = 0; k <= p; ++ k ) {
|
||||
|
||||
var point = P[ uspan - p + k ][ vspan - q + l ].clone();
|
||||
var w = point.w;
|
||||
point.x *= w;
|
||||
point.y *= w;
|
||||
point.z *= w;
|
||||
temp[ l ].add( point.multiplyScalar( Nu[ k ] ) );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var Sw = new _build_three_module_js__WEBPACK_IMPORTED_MODULE_0__.Vector4( 0, 0, 0, 0 );
|
||||
for ( var l = 0; l <= q; ++ l ) {
|
||||
|
||||
Sw.add( temp[ l ].multiplyScalar( Nv[ l ] ) );
|
||||
|
||||
}
|
||||
|
||||
Sw.divideScalar( Sw.w );
|
||||
target.set( Sw.x, Sw.y, Sw.z );
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ "./node_modules/three/examples/jsm/libs/stats.module.js":
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,4 +1,6 @@
|
||||
import * as THREE from 'three'
|
||||
import { NURBSCurve } from 'three/examples/jsm/curves/NURBSCurve'
|
||||
import { BufferGeometryUtils } from 'three/examples/jsm/utils/BufferGeometryUtils'
|
||||
import ObjectWrapper from './ObjectWrapper'
|
||||
import { getConversionFactor } from './Units'
|
||||
|
||||
@@ -13,6 +15,7 @@ export default class Coverter {
|
||||
}
|
||||
|
||||
this.objectLoader = objectLoader
|
||||
this.curveSegmentLength = 0.1
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -43,7 +46,7 @@ export default class Coverter {
|
||||
callback( await this[`${type}ToBufferGeometry`]( obj.data || obj ) )
|
||||
return
|
||||
} catch ( e ) {
|
||||
console.warn( `(Traversing - direct) Failed to convert ${type} with id: ${obj.id}` )
|
||||
console.warn( `(Traversing - direct) Failed to convert ${type} with id: ${obj.id}`, e )
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +64,7 @@ export default class Coverter {
|
||||
|
||||
// return // returning here is faster but excludes objects that have a display value and displayable children (ie, a wall with windows)
|
||||
} catch ( e ) {
|
||||
console.warn( `(Traversing) Failed to convert obj with id: ${obj.id}` )
|
||||
console.warn( `(Traversing) Failed to convert obj with id: ${obj.id} — ${e.message}` )
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,13 +207,202 @@ export default class Coverter {
|
||||
}
|
||||
|
||||
// TODOs:
|
||||
// async PointToBufferGeometry( obj ) {}
|
||||
// async LineToBufferGeometry( obj ) {}
|
||||
// async PolylineToBufferGeometry( obj ) {}
|
||||
// async PolycurveToBufferGeometry( obj ) {}
|
||||
// async CurveToBufferGeometry( obj ) {}
|
||||
// async CircleToBufferGeometry( obj ) {}
|
||||
// async ArcToBufferGeometry( obj ) {}
|
||||
// async EllipseToBufferGeometry( obj ) {}
|
||||
async PointToBufferGeometry( obj ) {
|
||||
let conversionFactor = getConversionFactor( obj.units )
|
||||
const v = new THREE.Vector3( obj.value[0]* conversionFactor,obj.value[1]* conversionFactor,obj.value[2] * conversionFactor )
|
||||
let buf = new THREE.BufferGeometry().setFromPoints( [ v ] )
|
||||
|
||||
delete obj.value
|
||||
delete obj.speckle_type
|
||||
|
||||
return new ObjectWrapper( buf, obj, 'point' )
|
||||
}
|
||||
|
||||
async LineToBufferGeometry( obj ) {
|
||||
return this.PolylineToBufferGeometry( obj )
|
||||
}
|
||||
async PolylineToBufferGeometry( object ) {
|
||||
let obj = {}
|
||||
Object.assign( obj,object )
|
||||
delete object.value
|
||||
delete object.speckle_type
|
||||
|
||||
let conversionFactor = getConversionFactor( obj.units )
|
||||
|
||||
obj.value = await this.dechunk( obj.value )
|
||||
|
||||
const points = []
|
||||
for ( let i = 0; i < obj.value.length; i+=3 ) {
|
||||
points.push( new THREE.Vector3( obj.value[ i ]* conversionFactor,obj.value[i+1]* conversionFactor,obj.value[i+2] * conversionFactor ) )
|
||||
}
|
||||
const geometry = new THREE.BufferGeometry().setFromPoints( points )
|
||||
|
||||
delete obj.value
|
||||
|
||||
return new ObjectWrapper( geometry, obj, 'line' )
|
||||
}
|
||||
|
||||
async PolycurveToBufferGeometry( object ) {
|
||||
let obj = {}
|
||||
Object.assign( obj,object )
|
||||
delete object.value
|
||||
delete object.speckle_type
|
||||
delete object.displayValue
|
||||
delete object.segments
|
||||
|
||||
console.log( 'Polycurve to buffer', obj )
|
||||
|
||||
let buffers = []
|
||||
for ( let i = 0; i < obj.segments.length; i++ ) {
|
||||
const element = obj.segments[i]
|
||||
const conv = await this.convert( element )
|
||||
buffers.push( conv?.bufferGeometry )
|
||||
}
|
||||
let geometry = BufferGeometryUtils.mergeBufferGeometries( buffers )
|
||||
|
||||
delete obj.segments
|
||||
delete obj.speckle_type
|
||||
|
||||
return new ObjectWrapper( geometry , obj, 'line' )
|
||||
}
|
||||
|
||||
async CurveToBufferGeometry( object ) {
|
||||
let obj = {}
|
||||
Object.assign( obj,object )
|
||||
delete object.value
|
||||
delete object.speckle_type
|
||||
delete object.displayValue
|
||||
|
||||
obj.points = await this.dechunk( obj.points )
|
||||
obj.weights = await this.dechunk( obj.weights )
|
||||
obj.knots = await this.dechunk( obj.knots )
|
||||
|
||||
try {
|
||||
console.log( 'Curve to buffer', obj )
|
||||
let conversionFactor = getConversionFactor( obj.units )
|
||||
|
||||
// Convert points+weights to Vector4
|
||||
const points = []
|
||||
for ( let i = 0; i < obj.points.length; i+=3 ) {
|
||||
points.push( new THREE.Vector4( obj.points[ i ]* conversionFactor,obj.points[i+1]* conversionFactor,obj.points[i+2] * conversionFactor, obj.weights[i/3] * conversionFactor ) )
|
||||
}
|
||||
// Convert knots from rhino compact format to normal format.
|
||||
let knots = [ obj.knots[0] ]
|
||||
knots = knots.concat( obj.knots )
|
||||
knots.push( knots[knots.length -1] )
|
||||
|
||||
// Create the nurbs curve
|
||||
const curve = new NURBSCurve( obj.degree, knots, points, null, null )
|
||||
|
||||
// Delete everything unnecessary from the metadata object.
|
||||
delete obj.speckle_type
|
||||
delete obj.displayValue
|
||||
delete obj.points
|
||||
delete obj.weights
|
||||
delete obj.knots
|
||||
|
||||
// Compute appropriate curve subdivisions
|
||||
let div = curve.getLength() / 0.1
|
||||
div = parseInt( div.toString() )
|
||||
if ( div < 20 ) div = 20
|
||||
if ( div > 4000 ) div = 4000
|
||||
|
||||
// Divide the nurbs curve in points
|
||||
var pts = curve.getPoints( div )
|
||||
return new ObjectWrapper( new THREE.BufferGeometry().setFromPoints( pts ), obj, 'line' )
|
||||
|
||||
} catch ( e ) {
|
||||
console.warn( 'Error converting nurbs curve, falling back to displayValue', obj )
|
||||
const poly = await this.PolylineToBufferGeometry( obj.displayValue )
|
||||
|
||||
delete obj.speckle_type
|
||||
delete obj.displayValue
|
||||
delete obj.points
|
||||
delete obj.weights
|
||||
delete obj.knots
|
||||
|
||||
return new ObjectWrapper( poly.bufferGeometry, obj, 'line' )
|
||||
}
|
||||
}
|
||||
|
||||
async CircleToBufferGeometry( obj ) {
|
||||
const points = this.getCircularCurvePoints( obj.plane, obj.radius )
|
||||
const geometry = new THREE.BufferGeometry().setFromPoints( points )
|
||||
|
||||
delete obj.value
|
||||
delete obj.speckle_type
|
||||
|
||||
return new ObjectWrapper( geometry, obj, 'line' )
|
||||
}
|
||||
|
||||
|
||||
async ArcToBufferGeometry( obj ) {
|
||||
const points = this.getCircularCurvePoints( obj.plane, obj.radius, obj.startAngle, obj.endAngle )
|
||||
const geometry = new THREE.BufferGeometry().setFromPoints( points )
|
||||
|
||||
delete obj.speckle_type
|
||||
delete obj.startPoint
|
||||
delete obj.endPoint
|
||||
delete obj.plane
|
||||
delete obj.midPoint
|
||||
|
||||
return new ObjectWrapper( geometry, obj, 'line' )
|
||||
}
|
||||
getCircularCurvePoints( plane, radius, startAngle = 0, endAngle = 2*Math.PI, res = this.curveSegmentLength ) {
|
||||
|
||||
// Get alignment vectors
|
||||
const center = new THREE.Vector3( plane.origin.value[0], plane.origin.value[1], plane.origin.value[2] )
|
||||
const xAxis = new THREE.Vector3( plane.xdir.value[0], plane.xdir.value[1], plane.xdir.value[2] )
|
||||
const yAxis = new THREE.Vector3( plane.ydir.value[0], plane.ydir.value[1], plane.ydir.value[2] )
|
||||
|
||||
// Determine resolution
|
||||
let resolution = ( endAngle - startAngle ) * radius / res
|
||||
resolution = parseInt( resolution.toString() )
|
||||
|
||||
let points = []
|
||||
|
||||
for ( let index = 0; index <= resolution; index++ ) {
|
||||
let t = startAngle + index * ( endAngle - startAngle ) / resolution
|
||||
let x = Math.cos( t ) * radius
|
||||
let y = Math.sin( t ) * radius
|
||||
const xMove = new THREE.Vector3( xAxis.x * x, xAxis.y * x, xAxis.z * x )
|
||||
const yMove = new THREE.Vector3( yAxis.x * y, yAxis.y * y, yAxis.z * y )
|
||||
|
||||
let pt = new THREE.Vector3().addVectors( xMove, yMove ).add( center )
|
||||
points.push( pt )
|
||||
}
|
||||
return points
|
||||
}
|
||||
|
||||
async EllipseToBufferGeometry( obj ) {
|
||||
|
||||
const center = new THREE.Vector3( obj.plane.origin.value[0],obj.plane.origin.value[1],obj.plane.origin.value[2] )
|
||||
const xAxis = new THREE.Vector3( obj.plane.xdir.value[0],obj.plane.xdir.value[1],obj.plane.xdir.value[2] )
|
||||
const yAxis = new THREE.Vector3( obj.plane.ydir.value[0],obj.plane.ydir.value[1],obj.plane.ydir.value[2] )
|
||||
console.log( center,xAxis,yAxis )
|
||||
|
||||
let resolution = 2 * Math.PI * obj.radius1 / 0.1
|
||||
resolution = parseInt( resolution.toString() )
|
||||
let points = []
|
||||
|
||||
for ( let index = 0; index <= resolution; index++ ) {
|
||||
let t = index * Math.PI * 2 / resolution
|
||||
let x = Math.cos( t ) * obj.radius1
|
||||
let y = Math.sin( t ) * obj.radius2
|
||||
const xMove = new THREE.Vector3( xAxis.x * x, xAxis.y * x, xAxis.z * x )
|
||||
const yMove = new THREE.Vector3( yAxis.x * y, yAxis.y * y, yAxis.z * y )
|
||||
|
||||
let pt = new THREE.Vector3().addVectors( xMove, yMove ).add( center )
|
||||
points.push( pt )
|
||||
}
|
||||
console.log( points )
|
||||
const geometry = new THREE.BufferGeometry().setFromPoints( points )
|
||||
|
||||
delete obj.value
|
||||
delete obj.speckle_type
|
||||
|
||||
return new ObjectWrapper( geometry, obj, 'line' )
|
||||
}
|
||||
|
||||
// async SurfaceToBufferGeometry( obj ) {}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import * as THREE from 'three'
|
||||
import debounce from 'lodash.debounce'
|
||||
|
||||
|
||||
/**
|
||||
* Manages objects and provides some convenience methods to focus on the entire scene, or one specific object.
|
||||
*/
|
||||
@@ -42,8 +41,9 @@ export default class SceneObjectManager {
|
||||
envMap: this.viewer.cubeCamera.renderTarget.texture
|
||||
} )
|
||||
|
||||
// this.lineMaterial = new
|
||||
this.lineMaterial = new THREE.LineBasicMaterial( { color: 0x000000 } )
|
||||
|
||||
this.pointMaterial = new THREE.PointsMaterial( { size: 10, sizeAttenuation: false, color: 0x000000 } )
|
||||
|
||||
this.objectIds = []
|
||||
this.postLoad = debounce( () => { this._postLoadFunction() }, 200 )
|
||||
@@ -52,7 +52,7 @@ export default class SceneObjectManager {
|
||||
}
|
||||
|
||||
get objects() {
|
||||
return [ ...this.solidObjects.children, ...this.transparentObjects.children ]
|
||||
return [ ...this.solidObjects.children, ...this.transparentObjects.children, ...this.lineObjects.children, ...this.pointObjects.children ]
|
||||
}
|
||||
|
||||
// Note: we might switch later down the line from cloning materials to solely
|
||||
@@ -129,10 +129,18 @@ export default class SceneObjectManager {
|
||||
|
||||
addLine( wrapper ) {
|
||||
const line = new THREE.Line( wrapper.bufferGeometry, this.lineMaterial )
|
||||
line.userData = wrapper.meta
|
||||
line.uuid = wrapper.meta.id
|
||||
this.objectIds.push( line.uuid )
|
||||
this.lineObjects.add( line )
|
||||
}
|
||||
|
||||
addPoint( wrapper ){
|
||||
// TODO
|
||||
var dot = new THREE.Points( wrapper.bufferGeometry, this.pointMaterial )
|
||||
dot.userData = wrapper.meta
|
||||
dot.uuid = wrapper.meta.id
|
||||
this.objectIds.push( dot.uuid )
|
||||
this.pointObjects.add( dot )
|
||||
}
|
||||
|
||||
removeObject( id ) {
|
||||
|
||||
@@ -51,7 +51,7 @@ export default class ViewerObjectLoader {
|
||||
total = obj.totalChildrenCount
|
||||
}
|
||||
current++
|
||||
this.viewer.emit( 'load-progress', { progress: current/total, id: this.objectId } )
|
||||
this.viewer.emit( 'load-progress', { progress: current/( total+1 ), id: this.objectId } )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,10 +24,27 @@ The server is a nodejs app. Core external dependencies are a Redis and Postgresq
|
||||
|
||||
The frontend is a static Vue app.
|
||||
|
||||
### ➡️ [Viewer](packages/viewer), the Speckle Viewer.
|
||||
|
||||
The viewer is a [threejs](https://threejs.org/) extension that allows you to display data from Speckle.
|
||||
|
||||
## Developing and Debugging
|
||||
|
||||
To get started, first clone this repo. Check out the detailed instructions for each module in their respective folder (see links above).
|
||||
|
||||
## Bootsrap local Speckle Server
|
||||
|
||||
> prerequisites: [Docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/)
|
||||
|
||||
To get a local Server stack up and running quickly:
|
||||
|
||||
- clone this repository
|
||||
- copy `.env-example` file from the server module to the project root and rename to `.env`
|
||||
- fill out the environment variables in the `.env` file, follow the comment instructions
|
||||
- run `$ docker-compose up`
|
||||
|
||||
This gets you an empty server running on [localhost:3000](http://localhost:3000)
|
||||
|
||||
## Contributing
|
||||
|
||||
Please make sure you read the [contribution guidelines](CONTRIBUTING.md) for an overview of the best practices we try to follow.
|
||||
|
||||
Reference in New Issue
Block a user