Issue/15 implement 3 d model page route #27

emanuelGitCodes · 2021-10-22T13:58:37Z

Review changes done to implement 3d models.

Former-commit-id: 584e6c3

Former-commit-id: 4c02d6e

Former-commit-id: d25679e

Former-commit-id: a45d8e9

Former-commit-id: 17e376b

Former-commit-id: 277769d

Former-commit-id: 0b18ad9

Former-commit-id: a725ff4

Former-commit-id: f7df1cd

Former-commit-id: 6ea792a

Former-commit-id: 9ca06c9

Former-commit-id: aaac4c0

Former-commit-id: 78ffb9e

Former-commit-id: d106cb7

Former-commit-id: 7f0b878

Former-commit-id: b0078f0

Former-commit-id: 285a1d1

clpetersonucf · 2021-11-16T21:55:08Z

This is continuing to look better and better. Some more feedback for the creator specifically, as the experience becomes more refined:

The media upload dialog no longer displays after you close the intro dialog. I have to select "Choose a different image" manually.
The "Rotating Model" button is a little deceptive, since that's the current state but gives no hint as to what clicking the button should actually do. I would prefer it accurately describe the action, something like "Toggle label placement" and "Toggle rotation"
There really needs to be a keyboard shortcut to enable rotation mode (while the key is held) when in label placement mode
The "Rotating"/"Labeling" indicator on the bottom-left can be clicked, and doing so causes the indicator to expand and fill the entire left-hand menu bar. I'm not sure if that's intentional.
"Scale Up"/"Scale Down" should be more descriptive. Maybe a sub-header above it to indicate what you're scaling: "Label anchor size" or something.
Anchor scaling is a little inconsistent. In the model I tried, I scaled down the anchors by a size or two, then saved and reloaded the creator - the anchors were a different size altogether. Additionally, the size of the anchors does not appear to be saved to the qset, or is not applied correctly when the qset is reloaded.
Hovering a label correctly recolors the anchors, but saving and reloading causes a console error when I hover over an anchor, and the anchor does not change colors.
Anchors should probably have a minimum and maximum size they can be scaled to (so they don't disappear completely)

Former-commit-id: 0ebeb09

Former-commit-id: 0a43b21

Former-commit-id: 1a521c5

Former-commit-id: ec6b135

Former-commit-id: 81767bd

Former-commit-id: bedfa87

Former-commit-id: 1735e02

Former-commit-id: d32089a

…anuelGitCodes/labeling-materia-widget into issue/15-Implement-3D-model-PageRoute

FrenjaminBanklin

It looks like the CoffeeScript files are no longer necessary, according to the Webpack configuration.

Remove any files that are not necessary and do a sweep for leftover console.logs.

FrenjaminBanklin · 2021-12-17T21:07:02Z

src/core3D.js

+			intersects[0].uv
+		)
+	}
+	console.log(intersects[0])


Don't leave in this console.log.

clpetersonucf

In addition to my inline comments, the coffeeBag and models3D directories should be removed, except for anything required by the demo.

clpetersonucf · 2022-01-11T15:50:17Z

src/coffeeBag/creator.coffee

@@ -14,11 +14,13 @@ Namespace('Labeling').Creator = do ->
 	# store image dimensions in case the user cancels the resize
 	_lastImgDimensions = {}

-	# track if the user is "getting started" or well on their way
+	# track if the user is "get`ting started" or well on their way


clpetersonucf · 2022-01-11T15:51:00Z

src/coffeeBag/draw.coffee

@@ -1,8 +1,12 @@
+
+# Does not import
+# import './build/three.js'


If this is leftover or placeholder code, it should probably be removed.

clpetersonucf · 2022-01-11T15:52:01Z

src/core3D.js

+
+function onError(error) {
+	// Returns a console log ERROR when model doesn't load
+	console.log('ERROR: ' + error)


I would use console.warn or console.error for this one.

clpetersonucf · 2022-01-11T15:52:42Z

src/core3D.js

+			intersects[0].uv
+		)
+	}
+	console.log(intersects[0])


clpetersonucf · 2022-01-11T15:53:43Z

src/creator.js

+// Temporarily disable while using MWDK
+
+// Using this style of import will cause the 3D to run every time even when on 2D.
+// import { renderedSpheresGroup } from './core3D.js'


If this is placeholder code, it should be removed

clpetersonucf · 2022-01-11T16:24:57Z

src/creator.js

+
+	function qsetOption3D(_qset) {
+		let _anchorOpacityValue = 1.0
+		console.log(highlightSpheresGroup.children[0])


Should remove unnecessary console logs

clpetersonucf · 2022-01-11T16:25:10Z

src/creator.js

+			sphereScale: highlightSpheresGroup.children[0].scale
+		}
+
+		console.log(_qset.options.sphereRadius)


Remove unnecessary console logs

clpetersonucf · 2022-01-11T16:39:24Z

src/creator.js

+		let keyboard = document.createElement('div')
+		keyboard.id = 'keyboard-text'
+		keyboard.classList.add('keyboardText')
+		keyboard.innerHTML = 'Arrow Keys:'


We can condense this string to a single line, instead of concatenating multiple strings and using the <br /> tag:

keyboard.innerHTML = 'Arrow Keys: \n · Rotate camera. \n Option/alt: \n · While pressing change between rotating and labeling'

You'll also have to add a new style in your CSS:

.keyboardText { white-space: pre; }

clpetersonucf · 2022-01-11T16:39:57Z

src/creator.js

+	function mouseText() {
+		let mouse = document.createElement('div')
+		mouse.id = 'mouse-text'
+		mouse.classList.add('keyboardText')


Same deal as my comment on line 1314

clpetersonucf · 2022-01-11T16:40:14Z

src/creator.js

+			label.setAttribute('data-y', vector.y)
+		})
+
+		return _drawBoard()


Return not required

emanuelGitCodes added 30 commits March 3, 2021 08:56

Decaffeniate files to javascript

9de2789

Decaffeniate files to javascript

1de35ed

Decaffeniate files to javascript

f91f9b3

Decaffeniate files to javascript

4afaba4

Working on rendering a 3D object

5b28b47

Former-commit-id: 584e6c3

Working on rendering a 3D object

584e6c3

Add THREE JS files, and mod webpack

528a440

Former-commit-id: 4c02d6e

Add THREE JS files, and mod webpack

4c02d6e

Add 3D object and confined's sceen to the board

2ea8088

Former-commit-id: d25679e

Add 3D object and confined's sceen to the board

d25679e

Add arrow in 3D space, also using canvas draw one in 2D space.

cb6f16f

Former-commit-id: a45d8e9

Add arrow in 3D space, also using canvas draw one in 2D space.

a45d8e9

Add 3D view in a 2D canvas

001623e

Former-commit-id: 17e376b

Add 3D view in a 2D canvas

17e376b

Mostly reformat and Group obj

c47b584

Former-commit-id: 277769d

Mostly reformat and Group obj

277769d

Brain is burned

40f2e81

Former-commit-id: 0b18ad9

Brain is burned

0b18ad9

Rename of files and update

5a04826

Former-commit-id: a725ff4

Rename of files and update

a725ff4

3D canvas limit same as id=board

8ae0e1c

Former-commit-id: f7df1cd

3D canvas limit same as id=board

f7df1cd

Update draw3D.js so code is readable

99889fa

Former-commit-id: 6ea792a

Update draw3D.js so code is readable

6ea792a

Working on dynamically changing height.

b3bbb20

Former-commit-id: 9ca06c9

Working on dynamically changing height.

9ca06c9

Render Multiple Objects at the same time.

e94f5d9

Former-commit-id: aaac4c0

Render Multiple Objects at the same time.

aaac4c0

Show a basic idea of finished product

f0ed9fa

Former-commit-id: 78ffb9e

Show a basic idea of finished product

78ffb9e

emanuelGitCodes added 8 commits November 15, 2021 13:07

Scalling is done evently on all spheres

d80323d

Former-commit-id: d106cb7

Scalling is done evently on all spheres

d106cb7

In the player the line move with the model.

317fae5

Former-commit-id: 7f0b878

In the player the line move with the model.

7f0b878

Player recieves radius from creator.

6f18a81

Former-commit-id: b0078f0

Player recieves radius from creator.

b0078f0

Player sphere scale to the same scale as Creator.

7e863fe

Former-commit-id: 285a1d1

Player sphere scale to the same scale as Creator.

285a1d1

emanuelGitCodes added 16 commits November 17, 2021 13:35

Update based on feedback

eaa1009

Former-commit-id: 0ebeb09

Update based on feedback

0ebeb09

In creator the alt key changes game state.

2f724df

Former-commit-id: 0a43b21

In creator the alt key changes game state.

0a43b21

Updating player line animation

a7e650f

Former-commit-id: 1a521c5

Updating player line animation

1a521c5

Completed player animation

a78dea0

Former-commit-id: ec6b135

Completed player animation

ec6b135

Add keyboard controls to the player

1d5e46e

Former-commit-id: 81767bd

Add keyboard controls to the player

81767bd

Re-enable the media importer.

71b7c66

Former-commit-id: bedfa87

Re-enable the media importer.

bedfa87

Quick improvement to the keyboard support for both sides.

54558ce

Former-commit-id: 1735e02

Quick improvement to the keyboard support for both sides.

1735e02

Instructions menu functionality

9c878f3

Former-commit-id: d32089a

Instructions menu functionality

d32089a

emanuelGitCodes force-pushed the issue/15-Implement-3D-model-PageRoute branch from d32089a to 9c878f3 Compare December 15, 2021 16:33

Merge branch 'issue/15-Implement-3D-model-PageRoute' of github.com:em…

3ef6df4

…anuelGitCodes/labeling-materia-widget into issue/15-Implement-3D-model-PageRoute

FrenjaminBanklin requested changes Dec 17, 2021

View reviewed changes

clpetersonucf requested changes Jan 11, 2022

View reviewed changes

Updated files based on review feedback.

ecfc97f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue/15 implement 3 d model page route #27

Issue/15 implement 3 d model page route #27

emanuelGitCodes commented Oct 22, 2021

clpetersonucf commented Nov 16, 2021

FrenjaminBanklin left a comment

FrenjaminBanklin Dec 17, 2021

clpetersonucf Jan 11, 2022

clpetersonucf left a comment

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

clpetersonucf Jan 11, 2022

		@@ -1,8 +1,12 @@

		# Does not import
		# import './build/three.js'

Issue/15 implement 3 d model page route #27

Are you sure you want to change the base?

Issue/15 implement 3 d model page route #27

Conversation

emanuelGitCodes commented Oct 22, 2021

clpetersonucf commented Nov 16, 2021

FrenjaminBanklin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clpetersonucf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment