LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

3D-viewer v2 #1870

Merged
btzr-io merged 16 commits from three-v2 into master 2018-08-22 21:10:06 +02:00
Conversation 8 Commits 16 Files changed 8 +358 -147
btzr-io commented 2018-08-13 05:40:22 +02:00 (Migrated from github.com)
Copy link

Todo [WIP]

## Todo [WIP] - [x] Add controls. [dat.gui](https://github.com/dataarts/dat.gui) - [x] Minor Threejs [optimizations](https://rawgit.com/moroine/three.js/b4afbcd39f5de332e2251f86924da29fc9f8831b/docs/#manual/introduction/Optimizations) - [x] Fix memory leak https://github.com/lbryio/lbry-desktop/issues/1863 - [x] Remove debug messages. - [x] Minor geometry (BufferGeometry) optimization https://github.com/lbryio/lbry-desktop/pull/1870#pullrequestreview-145911218. - [x] Fix `material.flatShading`. - [x] Bug-fix: Set `mesh.center` as camera target for all loaders.
skhameneh (Migrated from github.com) reviewed 2018-08-13 05:40:22 +02:00
kauffj commented 2018-08-13 16:01:54 +02:00 (Migrated from github.com)
Copy link

@seanyesmunt if you can tell @jamesbiller how to run this version he can confirm the issue has been fixed

@seanyesmunt if you can tell @jamesbiller how to run this version he can confirm the issue has been fixed
tzarebczan commented 2018-08-13 16:50:45 +02:00 (Migrated from github.com)
Copy link

@jamesbiller try this build here: http://build.lbry.io/app/build-3096_commit-612dd80/

I'll test it out today as well.

@jamesbiller try this build here: http://build.lbry.io/app/build-3096_commit-612dd80/ I'll test it out today as well.
skhameneh (Migrated from github.com) reviewed 2018-08-14 06:14:44 +02:00
src/renderer/component/viewers/threeViewer/index.jsx
@ -14,4 +17,3 @@
autoRotate: boolean,
source: {
fileType: string,
downloadPath: string,
skhameneh (Migrated from github.com) commented 2018-08-14 06:14:44 +02:00
Copy link

Might want to add geometry.mergeVertices();

and if you end up having issues mapping textures, this might help:

function updateGeometryUv(geometry) {
  let max = geometry.boundingBox.max,
      min = geometry.boundingBox.min;
  let offset = new THREE.Vector2(0 - min.x, 0 - min.y);
  let range = new THREE.Vector2(max.x - min.x, max.y - min.y);
  let faces = geometry.faces;

  geometry.faceVertexUvs[0] = [];

  for(let i = 0; i < faces.length ; i++) {

      let v1 = geometry.vertices[faces[i].a],
          v2 = geometry.vertices[faces[i].b],
          v3 = geometry.vertices[faces[i].c];

      geometry.faceVertexUvs[0].push([
          new THREE.Vector2((v1.x + offset.x)/range.x ,(v1.y + offset.y)/range.y),
          new THREE.Vector2((v2.x + offset.x)/range.x ,(v2.y + offset.y)/range.y),
          new THREE.Vector2((v3.x + offset.x)/range.x ,(v3.y + offset.y)/range.y)
      ]);
  }
  geometry.uvsNeedUpdate = true;
}
Might want to add `geometry.mergeVertices();` and if you end up having issues mapping textures, this might help: ``` function updateGeometryUv(geometry) { let max = geometry.boundingBox.max, min = geometry.boundingBox.min; let offset = new THREE.Vector2(0 - min.x, 0 - min.y); let range = new THREE.Vector2(max.x - min.x, max.y - min.y); let faces = geometry.faces; geometry.faceVertexUvs[0] = []; for(let i = 0; i < faces.length ; i++) { let v1 = geometry.vertices[faces[i].a], v2 = geometry.vertices[faces[i].b], v3 = geometry.vertices[faces[i].c]; geometry.faceVertexUvs[0].push([ new THREE.Vector2((v1.x + offset.x)/range.x ,(v1.y + offset.y)/range.y), new THREE.Vector2((v2.x + offset.x)/range.x ,(v2.y + offset.y)/range.y), new THREE.Vector2((v3.x + offset.x)/range.x ,(v3.y + offset.y)/range.y) ]); } geometry.uvsNeedUpdate = true; } ```
skhameneh (Migrated from github.com) reviewed 2018-08-14 06:15:58 +02:00
src/renderer/component/viewers/threeViewer/index.jsx
@ -14,4 +17,3 @@
autoRotate: boolean,
source: {
fileType: string,
downloadPath: string,
skhameneh (Migrated from github.com) commented 2018-08-14 06:15:58 +02:00
Copy link

Also, some of the operations might be faster if you can do them before you convert the GeometryBuffer into a Geometry

Also, some of the operations might be faster if you can do them before you convert the `GeometryBuffer` into a `Geometry`
skhameneh commented 2018-08-14 06:16:37 +02:00 (Migrated from github.com)
Copy link

Looks good!

Looks good!
tzarebczan commented 2018-08-14 15:26:40 +02:00 (Migrated from github.com)
Copy link

@btzr-io definitely noticing an improvement with memory usage after leaving the 3d model (takes a few seconds) - it does seem to release the memory allocated. If you open multiple after another, you can still get pretty high usage on some 3d models.

@jamesbiller how's this working on your PC?

@btzr-io definitely noticing an improvement with memory usage after leaving the 3d model (takes a few seconds) - it does seem to release the memory allocated. If you open multiple after another, you can still get pretty high usage on some 3d models. @jamesbiller how's this working on your PC?
👍 1
jamesbiller commented 2018-08-14 17:56:39 +02:00 (Migrated from github.com)
Copy link

@tzarebczan It's been working a hell of a lot smoother! Good work

@tzarebczan It's been working a hell of a lot smoother! Good work
👍 1
btzr-io (Migrated from github.com) reviewed 2018-08-15 02:00:37 +02:00
src/renderer/component/viewers/threeViewer/index.jsx
@ -14,4 +17,3 @@
autoRotate: boolean,
source: {
fileType: string,
downloadPath: string,
btzr-io (Migrated from github.com) commented 2018-08-15 02:00:37 +02:00
Copy link

We don't really support textures ATM so that won't be a problem...

We don't really support textures ATM so that won't be a problem...
btzr-io commented 2018-08-19 21:27:08 +02:00 (Migrated from github.com)
Copy link

Ready for review and more testing.

Ready for review and more testing.
neb-b commented 2018-08-20 18:41:04 +02:00 (Migrated from github.com)
Copy link

@btzr-io The new controls are awesome! It looks good from testing, I'll let @skhameneh do the dev review since he has a better understanding of the threejs stuff.

@btzr-io The new controls are awesome! It looks good from testing, I'll let @skhameneh do the dev review since he has a better understanding of the threejs stuff.
👍 1
tzarebczan commented 2018-08-21 16:21:57 +02:00 (Migrated from github.com)
Copy link

@btzr-io from initial testing, you could also check off Fix memory leak #1863 - it's definitely better in this version.

@btzr-io from initial testing, you could also check off `Fix memory leak #1863` - it's definitely better in this version.
Sign in to join this conversation.
Reviewers
No reviewers
skhameneh
Labels
Clear labels   
accessibility

   
app-parity

   
area: creator

   
area: daemon

   
area: design

   
area: devops

   
area: discovery

   
area: docs

   
area: installer

   
area: internal

   
area: livestream

   
area: performance

   
area: proposal

Work is part of a proposal

  
area: reposts

   
area: rewards

   
area: search

   
area: security

   
area: subscriptions

   
area: sync

   
area: ux

   
area: viewer

   
area: wallet

   
BEAMER

Beamer is waiting on you!

  
channel

   
comments

   
community PR

   
consider soon

Discuss this issue at the next planning meeting, then remove this label

  
core team

   
css

   
dependencies

   
electron

   
Epic

   
feature request

   
first-timers-only

   
good first issue

   
hacktoberfest

Welcome to Hacktoberfest

  
help wanted

   
hub-dependent

   
icebox

Long-term storage

  
Invalid

   
level: 0

   
level: 1

No knowledge of the existing code required

  
level: 2

Some knowledge of the existing code is recommended

  
level: 3

Significant knowledge of the existing code is recommended

  
level: 4

Intimate knowledge of the existing code is recommended

  
merge when green

   
needs: exploration

Solution unclear, needs research

  
needs: grooming

Issue needs to be groomed before work can start

  
needs: priority

Priority level needs to be defined

  
needs: repro

Issue needs step-by-step instructions on how to reproduce in latest code

  
needs: tech design

Needs technical design signoff before implementation can begin

  
notifications

   
odysee

   
on hold

Temporarily paused

  
playlists

   
priority: blocker

Issue is blocking release, do ASAP

  
priority: high

Work needs to be moved into sprint ASAP

  
priority: low

Work should be done but can stay in the backlog for now

  
priority: medium

Work needs to be done within 2-3 sprints

  
protocol dependent

   
recsys

   
redesign

general redesign not prioritize for anyone release

  
regression

   
resilience

   
sdk dependent

Requires work on lbry-sdk repo

  
Tom's Wishlist

   
trending

   
type: bug

Existing functionality is wrong or broken

  
type: discussion

A conversation. No specific changes requested

  
type: improvement

Existing (or partially existing) functionality needs to be changed

  
type: new feature

New functionality that does not exist yet

  
type: refactor

Minimal user-visible changes, but significant internal work

  
type: task

Either work that's not related to the code, or a small chore that does not fit into other categories

  
type: testing

Solution needs additional user testing

  
unplanned

Work that was not planned into the spirnt, took priority over planned work

  
windows
No labels
accessibility
app-parity
area: creator
area: daemon
area: design
area: devops
area: discovery
area: docs
area: installer
area: internal
area: livestream
area: performance
area: proposal
area: reposts
area: rewards
area: search
area: security
area: subscriptions
area: sync
area: ux
area: viewer
area: wallet
BEAMER
channel
comments
community PR
consider soon
core team
css
dependencies
electron
Epic
feature request
first-timers-only
good first issue
hacktoberfest
help wanted
hub-dependent
icebox
Invalid
level: 0
level: 1
level: 2
level: 3
level: 4
merge when green
needs: exploration
needs: grooming
needs: priority
needs: repro
needs: tech design
notifications
odysee
on hold
playlists
priority: blocker
priority: high
priority: low
priority: medium
protocol dependent
recsys
redesign
regression
resilience
sdk dependent
Tom's Wishlist
trending
type: bug
type: discussion
type: improvement
type: new feature
type: refactor
type: task
type: testing
unplanned
windows
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: LBRYCommunity/lbry-desktop#1870
No description provided.
Delete branch "three-v2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?