Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AMOEBA
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Amanda Ghassaei
AMOEBA
Commits
e580ad27
Commit
e580ad27
authored
Jun 29, 2016
by
amandaghassaei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nex textures
parent
4a86c0f5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
3 additions
and
2 deletions
+3
-2
assets/textures/cubeTextureShear.png
assets/textures/cubeTextureShear.png
+0
-0
assets/textures/cubeTextureShearFlex.png
assets/textures/cubeTextureShearFlex.png
+0
-0
assets/textures/cubeTextureShearFlexThumb.png
assets/textures/cubeTextureShearFlexThumb.png
+0
-0
assets/textures/cubeTextureShearThumb.png
assets/textures/cubeTextureShearThumb.png
+0
-0
assets/textures/cubeTextureThumb.png
assets/textures/cubeTextureThumb.png
+0
-0
js/plists/MaterialsPlist.js
js/plists/MaterialsPlist.js
+2
-1
js/three/ThreeModel.js
js/three/ThreeModel.js
+1
-1
No files found.
assets/textures/cubeTextureShear.png
0 → 100644
View file @
e580ad27
489 KB
assets/textures/cubeTextureShearFlex.png
0 → 100644
View file @
e580ad27
489 KB
assets/textures/cubeTextureShearFlexThumb.png
0 → 100644
View file @
e580ad27
6.27 KB
assets/textures/cubeTextureShearThumb.png
0 → 100644
View file @
e580ad27
2.9 KB
assets/textures/cubeTextureThumb.png
View replaced file @
4a86c0f5
View file @
e580ad27
3.13 KB
|
W:
|
H:
2.88 KB
|
W:
|
H:
2-up
Swipe
Onion skin
js/plists/MaterialsPlist.js
View file @
e580ad27
...
...
@@ -86,7 +86,7 @@ define([], function(){
name
:
"
Shear Flexure
"
,
color
:
"
#cda4f3
"
,
altColor
:
"
#cda4f3
"
,
texture
:
"
stripes
"
,
texture
:
"
cubeTextureShearFlex
"
,
properties
:{
conductive
:
false
,
density
:
3500
,
//kg/m^3
...
...
@@ -214,6 +214,7 @@ define([], function(){
name
:
"
Shear Actuator
"
,
color
:
"
#FFCC00
"
,
altColor
:
"
#FFCC00
"
,
texture
:
"
cubeTextureShear
"
,
properties
:{
conductive
:
false
,
density
:
6500
,
//kg/m^3
...
...
js/three/ThreeModel.js
View file @
e580ad27
...
...
@@ -7,7 +7,7 @@ define(['underscore', 'three', 'combinedCamera'], function(_, THREE){
//var camera = new THREE.CombinedCamera( window.innerWidth / 2, window.innerHeight / 2, 60, 0.01, 1000, - 500, 1000 );
var
camera
=
new
THREE
.
PerspectiveCamera
(
60
,
window
.
innerWidth
/
window
.
innerHeight
,
0.01
,
1000
);
//
camera.setLens(50);
//
camera.setLens(50);
var
scene
=
new
THREE
.
Scene
();
var
simScene
=
new
THREE
.
Scene
();
var
secondPassScene
=
new
THREE
.
Scene
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment