Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
38a06ca2
Commit
38a06ca2
authored
9 years ago
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
three line pieces warning
parent
4c1a5e69
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/baseplane/HexagonalBasePlane.js
+1
-1
1 addition, 1 deletion
js/baseplane/HexagonalBasePlane.js
js/baseplane/SquareBasePlane.js
+1
-1
1 addition, 1 deletion
js/baseplane/SquareBasePlane.js
js/lattice/latticeSubclasses/GIKLattice.js
+2
-2
2 additions, 2 deletions
js/lattice/latticeSubclasses/GIKLattice.js
with
4 additions
and
4 deletions
js/baseplane/HexagonalBasePlane.js
+
1
−
1
View file @
38a06ca2
...
...
@@ -52,7 +52,7 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three',
var
mesh
=
new
THREE
.
Mesh
(
planeGeometry
,
new
THREE
.
MeshBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
opacity
:
0.0
}));
// return [mesh];
return
[
mesh
,
new
THREE
.
Line
(
geometry
,
new
THREE
.
LineBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
linewidth
:
2
,
opacity
:
this
.
get
(
"
material
"
).
opacity
})
,
THREE
.
LinePieces
)];
return
[
mesh
,
new
THREE
.
Line
Segments
(
geometry
,
new
THREE
.
LineBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
linewidth
:
2
,
opacity
:
this
.
get
(
"
material
"
).
opacity
}))];
}
});
});
\ No newline at end of file
This diff is collapsed.
Click to expand it.
js/baseplane/SquareBasePlane.js
+
1
−
1
View file @
38a06ca2
...
...
@@ -34,7 +34,7 @@ define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three',
planeGeometry
.
computeFaceNormals
();
var
mesh
=
new
THREE
.
Mesh
(
planeGeometry
,
new
THREE
.
MeshBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
opacity
:
0.0
}));
return
[
mesh
,
new
THREE
.
Line
(
geometry
,
new
THREE
.
LineBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
linewidth
:
2
,
opacity
:
this
.
get
(
"
material
"
).
opacity
})
,
THREE
.
LinePieces
)];
return
[
mesh
,
new
THREE
.
Line
Segments
(
geometry
,
new
THREE
.
LineBasicMaterial
({
color
:
0x000000
,
transparent
:
true
,
linewidth
:
2
,
opacity
:
this
.
get
(
"
material
"
).
opacity
}))];
}
// _renderZIndexChange: function(){
...
...
This diff is collapsed.
Click to expand it.
js/lattice/latticeSubclasses/GIKLattice.js
+
2
−
2
View file @
38a06ca2
...
...
@@ -30,12 +30,12 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
},
_zIndexRotation
:
function
(
index
){
if
(
index
.
z
%
2
==
0
)
return
Math
.
PI
/
2
;
if
(
index
.
z
%
2
==
1
)
return
Math
.
PI
/
2
;
return
0
;
},
_zIndexRotationSuperCell
:
function
(
index
){
if
(
index
.
z
%
2
!=
0
)
return
-
Math
.
PI
/
2
;
//this goes neg if zIndexRotation rules are opp? need to clear this up eventually
if
(
index
.
z
%
2
!=
1
)
return
Math
.
PI
/
2
;
//
todo
this goes neg if zIndexRotation rules are opp? need to clear this up eventually
return
0
;
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment