temporal commit

rvcristiand · Jan 2, 2024 · 483b6ea · 483b6ea
1 parent 4be0a49
commit 483b6ea
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 37 deletions.
diff --git a/modules/mas.js b/modules/mas.js
@@ -108,7 +108,7 @@ var config = {
   'frame.opacity': 0.5,
   'frame.label': false,
 
-  'frame.axes.visible': true,
+  'frame.axes.visible': false,
   'frame.axes.size': 1,
 
   'frame.axes.head.radius': 0.04,
@@ -123,10 +123,10 @@ var config = {
 
   'support.analytical.size': 1,
 
-  'support.analytical.head.radius': 0.04,
+  'support.analytical.head.radius': 0.08,
   'support.analytical.head.height': 0.3,
 
-  'support.analytical.shaft.tube' : 0.04,
+  'support.analytical.shaft.tube' : 0.02,
   'support.analytical.straightShaft.length': 1,
   'support.analytical.curveShaft.radius': 1,
 
@@ -520,7 +520,7 @@ function init() {
   // loadFolder.add( config, 'load.as' ).options( [ 'components', 'resultant' ] ).name( 'as' ).onChange( as => setLoadAs( as ) );
   // add force folder
   let forceFolder = loadFolder.addFolder( "force" );
-  forceFolder.add( config, 'load.force.scale' ).name( 'scale' ).min( 0.1 ).max( 1 ).step( 0.01 ).onChange( scale => setLoadForceScale( scale ) );
+  forceFolder.add( config, 'load.force.scale' ).name( 'scale' ).min( 0.01 ).max( 1 ).step( 0.01 ).onChange( scale => setLoadForceScale( scale ) );
   forceFolder.addColor( config, 'load.resultant.force' ).name( 'color' ).onChange( color => resultantForceMaterial.color = new THREE.Color( color ) );
   // add torque folder
   let torqueFolder = loadFolder.addFolder( "torque" );
@@ -904,7 +904,7 @@ export function open( filename ) {
       // add suports
 	if ( json.hasOwnProperty( 'supports' ) ) {
 	    Object.values( json.supports ).forEach( support => {
-		addSupport( support.joint, support.ux, support.uy, support.uz, support.rx, support.ry, support.rz );
+		addSupport( support.joint, support.r_ux, support.r_uy, support.r_uz, support.r_rx, support.r_ry, support.r_rz );
 	    } );
 	}
 
@@ -923,8 +923,8 @@ export function open( filename ) {
 	    Object.values( load_pattern.frames ).forEach( loads => {  // load_types
 	      loads.forEach( load => {
 		  switch ( load.type ) {
-		  case "DistributedLoad":
-		      addUniformlyDistributedLoadAtFrame( load.load_pattern, load.frame, load.system, load.fx, load.fy, load.fz, load.mx, load.my, load.mz );
+		  case "UniformlyDistributedLoadDistributedLoad":
+		      addUniformlyDistributedLoadAtFrame( load.load_pattern, load.element, load.system, load.wx, load.wy, load.wz, load.mx, load.my, load.mz );
 		      break;
 		      // Object.entries( load_types.uniformly_distributed ).forEach( ( [ system, loads ] ) => loads.forEach(  ) );		      
 		  }

diff --git a/space_frame.json b/space_frame.json
@@ -12,16 +12,16 @@
             "name": "section1",
             "A": 0.12,
             "J": 0.001944,
-            "Iy": 0.0009,
-            "Iz": 0.0016
+            "Iyy": 0.0009,
+            "Izz": 0.0016
         },
         "section2": {
             "type": "Section",
             "name": "section2",
             "A": 0.1,
             "J": 0.0012734,
-            "Iy": 0.001333,
-            "Iz": 0.0005208
+            "Iyy": 0.001333,
+            "Izz": 0.0005208
         }
     },
     "joints": {
@@ -76,30 +76,30 @@
     "supports": {
         "2": {
             "joint": "2",
-            "ux": true,
-            "uy": true,
-            "uz": true,
-            "rx": true,
-            "ry": true,
-            "rz": true
+            "r_ux": true,
+            "r_uy": true,
+            "r_uz": true,
+            "r_rx": true,
+            "r_ry": true,
+            "r_rz": true
         },
         "3": {
             "joint": "3",
-            "ux": true,
-            "uy": true,
-            "uz": true,
-            "rx": true,
-            "ry": true,
-            "rz": true
+            "r_ux": true,
+            "r_uy": true,
+            "r_uz": true,
+            "r_rx": true,
+            "r_ry": true,
+            "r_rz": true
         },
         "4": {
             "joint": "4",
-            "ux": true,
-            "uy": true,
-            "uz": true,
-            "rx": true,
-            "ry": true,
-            "rz": true
+            "r_ux": true,
+            "r_uy": true,
+            "r_uz": true,
+            "r_rx": true,
+            "r_ry": true,
+            "r_rz": true
         }
     },
     "load_patterns": {
@@ -108,20 +108,18 @@
             "frames": {
                 "1-2": [
                     {
-                        "type": "DistributedLoad",
+                        "type": "UniformlyDistributedLoad",
                         "load_pattern": "distributed loads",
-                        "frame": "1-2",
-                        "system": "local",
-                        "fy": -2.4
+                        "element": "1-2",
+                        "wy": -2.4
                     }
                 ],
                 "4-1": [
                     {
-                        "type": "DistributedLoad",
+                        "type": "UniformlyDistributedLoad",
                         "load_pattern": "distributed loads",
-                        "frame": "4-1",
-                        "system": "local",
-                        "fy": -3.5
+                        "element": "4-1",
+                        "wy": -3.5
                     }
                 ]
             }