Skip to content

GitLab

B
BlocksCAD
Commit 681f75d0 authored by Jennie Yoder's avatar Jennie Yoder
Browse files
Options

Merge branch 'development' 

Conflicts:
	blockly/core/tooltip.js

fixed merge conflict.
parents 639c5bbf 7107e051
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 38 deletions
blockly/core/tooltip.js
View file @ 681f75d0
......@@ -246,7 +246,7 @@ Blockly.Tooltip.show_ = function() {
var tmp = document.createElement('div');
tmp.innerHTML = tip;
var elem = tmp.getElementsByTagName('img')[0];
// if elem contains a src attribute I'll guess that it is a valid img
// if elem contains a src attribute I'll use it
if (elem['src']) {
div.appendChild(elem);
tooltip_is_image = 1;
......
blockscad/msg/js/de.js
View file @ 681f75d0
......@@ -46,11 +46,11 @@ Blockscad.Msg.COLOR = "Farbe";
Blockscad.Msg.COLOR_HSV_TOOLTIP = "Apply a color by specifying the hue, saturation, and value components. Each value should be between 0 and 100.";
Blockscad.Msg.COLOR_HUE = "hue";
Blockscad.Msg.COLOR_RGB_TOOLTIP = "Apply a color by specifying the red, blue, and green components. Each value should be between 0 and 100.";
Blockscad.Msg.COLOR_SATURATION = "Sättigung";
Blockscad.Msg.COLOR_SATURATION = "sättigung";
Blockscad.Msg.COLOR_TOOLTIP = "Applies the color to the child object, which must be 3D.";
Blockscad.Msg.COLOR_VALUE = "Wert";
Blockscad.Msg.CONFIRM_DIALOG_NO = "Cancel";
Blockscad.Msg.CONFIRM_DIALOG_YES = "Sure";
Blockscad.Msg.COLOR_VALUE = "wert";
Blockscad.Msg.CONFIRM_DIALOG_NO = "Abbrechen";
Blockscad.Msg.CONFIRM_DIALOG_YES = "Ja";
Blockscad.Msg.CONFIRM_NEW_PASSWORD = "Wiederhohle neues Password";
Blockscad.Msg.CONTROLS_FOR_TOOLTIP_CHAINHULL = "Return the convex hull of each shape in the loop with the next shape";
Blockscad.Msg.CONVEX_HULL = "Hülle";
......@@ -59,13 +59,13 @@ Blockscad.Msg.CUBE_TOOLTIP = "<img src='imgs/en/cube.svg' width='100px'>";
Blockscad.Msg.CYLINDER = "Zylinder";
Blockscad.Msg.CYLINDER_TOOLTIP = "<img src='imgs/en/cylinder.svg' width='90px'>";
Blockscad.Msg.DELETE_ACCOUNT = "Benutzer löschen";
Blockscad.Msg.DELETE_ACCOUNT_BUTTON = "Delete Account and Sign Out";
Blockscad.Msg.DELETE_ACCOUNT_BUTTON = "Lösche dein Konto und melde dich ab";
Blockscad.Msg.DELETE_ACCOUNT_CONFIRM = "Are you sure you want to delete your BlocksCAD account?";
Blockscad.Msg.DELETE_ACCOUNT_CONFIRM_PASSWORD = "Enter password to confirm";
Blockscad.Msg.DELETE_ACCOUNT_INSTRUCTIONS_ONE = "In about 48 hours your account will be permanently deleted.";
Blockscad.Msg.DELETE_ACCOUNT_INSTRUCTIONS_TWO = "If you change your mind, just sign in to your account within the next 48 hours.";
Blockscad.Msg.DELETE_PROJECT_CONFIRM = "Are you sure you want to delete *Project_name*?";
Blockscad.Msg.DIALOG_OR = "or";
Blockscad.Msg.DIALOG_OR = "oder";
Blockscad.Msg.DIFFERENCE = "Differenz";
Blockscad.Msg.DIFFERENCE_TOOLTIP = "Subtracts one or more objects from the first object in the list.";
Blockscad.Msg.DIRECTION_BACK = "hinten";
......@@ -76,7 +76,7 @@ Blockscad.Msg.DIRECTION_LEFT = "links";
Blockscad.Msg.DIRECTION_RIGHT = "rechts";
Blockscad.Msg.DIRECTION_TOP = "oben";
Blockscad.Msg.DISABLE_ALL = "Disable All Blocks";
Blockscad.Msg.DISCARD_ALL = "Lösche alle %1 Blöcke?";
Blockscad.Msg.DISCARD_ALL = "Bist du sicher, dass du alle %1 Blöcke löschen?";
Blockscad.Msg.DOCUMENTATION_LINK = "Dokumentation";
Blockscad.Msg.EMAIL_FIELD = "E-Mail";
Blockscad.Msg.ENABLE_ALL = "Enable All Blocks";
......@@ -101,8 +101,8 @@ Blockscad.Msg.EXAMPLE_ANTHIAS_FISH = "Anthias Fisch";
Blockscad.Msg.EXAMPLE_CUBE_WITH_CUTOUTS = "Kubus mit Ausspaarungen";
Blockscad.Msg.EXAMPLE_LOOP_SINE = "Sinus Funktion mit Wiederhohlungen";
Blockscad.Msg.EXAMPLE_LOOP_SUN = "Sonne mit Wiederhohlungen";
Blockscad.Msg.EXAMPLE_PARAMETRIC_BOX = "any size box";
Blockscad.Msg.EXAMPLE_PARAMETRIC_EQ_KNOT = "knot from parametric equations";
Blockscad.Msg.EXAMPLE_PARAMETRIC_BOX = "Schachtel";
Blockscad.Msg.EXAMPLE_PARAMETRIC_EQ_KNOT = "Kleeblattknoten mit Parametern";
Blockscad.Msg.FACES = "faces";
Blockscad.Msg.FANCYMIRROR_TOOLTIP = "Mirrors one or more objects across specified plane whose normal vector is from (0,0,0) to the point (x,y,z).";
Blockscad.Msg.FANCYROTATE_TOOLTIP = "Rotates one or more objects around a vector from the origin (0,0,0) to the point (x,y,z)";
......@@ -121,7 +121,7 @@ Blockscad.Msg.IMPORT_STL_MENU = "Importiere STL Datei in dieses Projekt";
Blockscad.Msg.INTERSECTION = "Schnittpunkt";
Blockscad.Msg.INTERSECTION_TOOLTIP = "Returns the intersection (area that overlaps) of two or more objects.";
Blockscad.Msg.LINEAREXTRUDE_TOOLTIP = "Extrudes one or more 2-dimensional objects by a specified height with a specified twist. Shape can be scaled as it extrudes in both x and y. It may optionally be centered around the origin.";
Blockscad.Msg.LINEAR_EXTRUDE = "linear extrude";
Blockscad.Msg.LINEAR_EXTRUDE = "lineares Herausziehen";
Blockscad.Msg.LOAD_BLOCKS_LOCAL = "Lade Blöcke von deinem PC hoch";
Blockscad.Msg.LOGIN_BUTTON = "Anmelden";
Blockscad.Msg.LOGIN_IN_PROGRESS = "Melde an...";
......@@ -170,7 +170,7 @@ Blockscad.Msg.RENDER_BUTTON = "Render";
Blockscad.Msg.RENDER_ERROR_EMPTY = "Nichts zum Rendern";
Blockscad.Msg.RENDER_ERROR_MIXED = "Es sind 2D und 3D Objekte vorhanden. Es darf aber nur eine Art vorhanden sein.";
Blockscad.Msg.RENDER_IN_PROGRESS = "Rendering...";
Blockscad.Msg.RESET_PASSWORD = "Reset Password";
Blockscad.Msg.RESET_PASSWORD = "Passwort zurücksetzen";
Blockscad.Msg.RESET_PASSWORD_INSTRUCTIONS = "Gib deinen Benutzernamen und deine E-Mailadresse ein und wir senden dir ein E-Mail mit Instruktionen um dein Passwort zurück zu setzen.";
Blockscad.Msg.RESET_PASSWORD_LINK_BUTTON = "Sende mir einen Link um mein Passwort zurück zu setzen!";
Blockscad.Msg.RESET_VIEW_BUTTON = "Ansicht zurücksetzen";
......@@ -178,7 +178,7 @@ Blockscad.Msg.RGB_COLOR_MODEL = "RGB";
Blockscad.Msg.ROTATE = "rotieren";
Blockscad.Msg.ROTATEEXTRUDE_TOOLTIP = "Rotate extrudes one or more 2-dimensional objects around the Z axis with a specified number of sides.";
Blockscad.Msg.ROTATE_ADVANCED = "fancy rotate";
Blockscad.Msg.ROTATE_EXTRUDE = "rotate extrude";
Blockscad.Msg.ROTATE_EXTRUDE = "rotiertes Herausziehen";
Blockscad.Msg.SAVE_BLOCKS_AS_COPY = "Als Kopie speichern";
Blockscad.Msg.SAVE_BLOCKS_LOCAL = "Lade Blöcke auf deinen PC herunter";
Blockscad.Msg.SAVE_BUTTON = "Speichern";
......@@ -186,9 +186,9 @@ Blockscad.Msg.SAVE_COMPLETE = "Gespeichert!";
Blockscad.Msg.SAVE_FAILED = "Speichern fehlgeschlagen.";
Blockscad.Msg.SAVE_FAILED_PROJECT_NAME = "Bitte benenne dein Projekt und probiere es nochmals.";
Blockscad.Msg.SAVE_IN_PROGRESS = "Speichere...";
Blockscad.Msg.SAVE_PROMPT = "Do you want to save your project?";
Blockscad.Msg.SAVE_PROMPT_NO = "Don't Save";
Blockscad.Msg.SAVE_PROMPT_YES = "Save";
Blockscad.Msg.SAVE_PROMPT = "Willst du dein Projekt speichern?";
Blockscad.Msg.SAVE_PROMPT_NO = "Nicht Speichern";
Blockscad.Msg.SAVE_PROMPT_YES = "Speichern";
Blockscad.Msg.SAVE_SCAD_LOCAL = "Lade OpenSCAD code herunter";
Blockscad.Msg.SCALE = "skalieren";
Blockscad.Msg.SCALE_TOOLTIP = "Scales one or more objects by a specified amount in dimensions x, y, and z.";
......@@ -206,12 +206,12 @@ Blockscad.Msg.TAPER_TOOLTIP = "Scales shape along an axis. The smallest value a
Blockscad.Msg.TEXT_DEFAULT_VALUE = "Text ersetzten";
Blockscad.Msg.TEXT_THICKNESS = "dicke";
Blockscad.Msg.TORUS = "Torus";
Blockscad.Msg.TORUS_TOOLTIP = "<img src='imgs/en/torus.svg' width='250px'>";
Blockscad.Msg.TORUS_TOOLTIP = "<img src='imgs/de/torus.svg' width='250px'>";
Blockscad.Msg.TRANSLATE = "transformiern";
Blockscad.Msg.TRANSLATE_TOOLTIP = "Translates (moves) one or more objects in specified dimensions x, y, and z.";
Blockscad.Msg.TWIST = "verdrehen";
Blockscad.Msg.UNION = "Vereinigung";
Blockscad.Msg.UNION_TOOLTIP = "Combines two or more objects into one.";
Blockscad.Msg.UNION_TOOLTIP = "Kombiniert zwei oder mehr Objekte in einem.";
Blockscad.Msg.USERNAME_FIELD = "Benutzername";
Blockscad.Msg.VARIABLES_BUMPED_ONE = "%1 variable blocks were displaced due to type mismatches";
Blockscad.Msg.VARIABLES_BUMPED_TWO = "variable '%1': type changed from %2 to %3";
......
blockscad/msg/json/de.json
View file @ 681f75d0
......@@ -59,18 +59,18 @@
"DELETE_ACCOUNT_INSTRUCTIONS_ONE": "In about 48 hours your account will be permanently deleted.",
"DELETE_ACCOUNT_INSTRUCTIONS_TWO": "If you change your mind, just sign in to your account within the next 48 hours.",
"DELETE_ACCOUNT_CONFIRM_PASSWORD": "Enter password to confirm",
"DELETE_ACCOUNT_BUTTON": "Delete Account and Sign Out",
"DELETE_ACCOUNT_BUTTON": "Lösche dein Konto und melde dich ab",
"REACTIVATE_ACCOUNT_TITLE": "Your account will not be deleted",
"REACTIVATE_ACCOUNT_EXPLAINED": "Your account has been reactivated - it is no longer scheduled to be deleted. If you didn't send a delete account request, you should change your password to make sure your account is secure.",
"REACTIVATE_BUTTON": "Okay",
"DELETE_PROJECT_CONFIRM": "Are you sure you want to delete *Project_name*?",
"CONFIRM_DIALOG_YES": "Sure",
"CONFIRM_DIALOG_NO": "Cancel",
"SAVE_PROMPT": "Do you want to save your project?",
"SAVE_PROMPT_YES": "Save",
"SAVE_PROMPT_NO": "Don't Save",
"RESET_PASSWORD": "Reset Password",
"DIALOG_OR": "or",
"CONFIRM_DIALOG_YES": "Ja",
"CONFIRM_DIALOG_NO": "Abbrechen",
"SAVE_PROMPT": "Willst du dein Projekt speichern?",
"SAVE_PROMPT_YES": "Speichern",
"SAVE_PROMPT_NO": "Nicht Speichern",
"RESET_PASSWORD": "Passwort zurücksetzen",
"DIALOG_OR": "oder",
"RESET_PASSWORD_INSTRUCTIONS": "Gib deinen Benutzernamen und deine E-Mailadresse ein und wir senden dir ein E-Mail mit Instruktionen um dein Passwort zurück zu setzen.",
"RESET_PASSWORD_LINK_BUTTON": "Sende mir einen Link um mein Passwort zurück zu setzen!",
"RENDER_BUTTON": "Render",
......@@ -93,8 +93,8 @@
"COLOR": "Farbe",
"SIDES": "Seiten",
"TAPER": "Kegel/Konus",
"LINEAR_EXTRUDE": "linear extrude",
"ROTATE_EXTRUDE": "rotate extrude",
"LINEAR_EXTRUDE": "lineares Herausziehen",
"ROTATE_EXTRUDE": "rotiertes Herausziehen",
"HEIGHT": "height",
"FACES": "faces",
"ACROSS": "gegenüber",
......@@ -167,7 +167,7 @@
"MOUSEOVER_UNDO": "Rückgänging",
"MOUSEOVER_REDO": "Wiederherstllen",
"MOUSEOVER_TRASHCAN": "Lösche alle Blöcke",
"DISCARD_ALL": "Lösche alle %1 Blöcke?",
"DISCARD_ALL": "Bist du sicher, dass du alle %1 Blöcke löschen?",
"WARNING_RELOAD_STL": "Warning: re-load your STL file block",
"ERROR_MESSAGE": "Fehler",
"RENDER_ERROR_EMPTY": "Nichts zum Rendern",
......@@ -177,7 +177,7 @@
"SPHERE_TOOLTIP": "<img src='imgs/en/sphere.svg' width='65'>",
"CUBE_TOOLTIP": "<img src='imgs/en/cube.svg' width='100px'>",
"CYLINDER_TOOLTIP": "<img src='imgs/en/cylinder.svg' width='90px'>",
"TORUS_TOOLTIP": "<img src='imgs/en/torus.svg' width='250px'>",
"TORUS_TOOLTIP": "<img src='imgs/de/torus.svg' width='250px'>",
"CIRCLE_TOOLTIP": "<img src='imgs/en/circle.svg' width='65'>",
"SQUARE_TOOLTIP": "<img src='imgs/en/square.svg' width='65'>",
"TRANSLATE_TOOLTIP": "Translates (moves) one or more objects in specified dimensions x, y, and z.",
......@@ -193,7 +193,7 @@
"ROTATEEXTRUDE_TOOLTIP": "Rotate extrudes one or more 2-dimensional objects around the Z axis with a specified number of sides.",
"FANCYROTATE_TOOLTIP": "Rotates one or more objects around a vector from the origin (0,0,0) to the point (x,y,z)",
"FANCYMIRROR_TOOLTIP": "Mirrors one or more objects across specified plane whose normal vector is from (0,0,0) to the point (x,y,z).",
"UNION_TOOLTIP": "Combines two or more objects into one.",
"UNION_TOOLTIP": "Kombiniert zwei oder mehr Objekte in einem.",
"DIFFERENCE_TOOLTIP": "Subtracts one or more objects from the first object in the list.",
"INTERSECTION_TOOLTIP": "Returns the intersection (area that overlaps) of two or more objects.",
"HULL_TOOLTIP": "Combines one or more objects by 'wrapping' them together in a hull.",
......@@ -213,8 +213,8 @@
"VARIABLES_BUMPED_TWO": "variable '%1': type changed from %2 to %3",
"EXAMPLE_CUBE_WITH_CUTOUTS": "Kubus mit Ausspaarungen",
"EXAMPLE_ANTHIAS_FISH": "Anthias Fisch",
"EXAMPLE_PARAMETRIC_BOX": "any size box",
"EXAMPLE_PARAMETRIC_BOX": "Schachtel",
"EXAMPLE_LOOP_SUN": "Sonne mit Wiederhohlungen",
"EXAMPLE_LOOP_SINE": "Sinus Funktion mit Wiederhohlungen",
"EXAMPLE_PARAMETRIC_EQ_KNOT": "knot from parametric equations"
"EXAMPLE_PARAMETRIC_EQ_KNOT": "Kleeblattknoten mit Parametern"
}
blockscad/msg/messages.js
View file @ 681f75d0
......@@ -19,8 +19,7 @@
* @fileoverview English strings.
* @author J. Yoder
*
* After modifying this file, either run 'build.py' from the parent directory,
* or run (from this directory):
* After modifying this file, either run (from this directory):
* js_to_json.py
* to regenerate json/{en,qqq,synonyms}.json.
*
......
examples/trefoil_knot_param_eq.xml
View file @ 681f75d0
<xml xmlns="http://blockscad.einsteinsworkshop.com"><version num="1.1.2"></version><color rgba="0,153,0"></color><block type="variables_set" id="1" x="-1917" y="-99"><field name="VAR">size</field><comment pinned="true" h="235.16995239257812" w="731.8300170898438">A trefoil knot can be described by these parametric equations:
<xml xmlns="http://blockscad.einsteinsworkshop.com"><version num="1.3.3"></version><color rgba="0,153,0"></color><block type="variables_set" id="794" x="-1917" y="-99"><field name="VAR">size</field><comment pinned="true" h="235" w="731">A trefoil knot can be described by these parametric equations:
x(t) = sin(t) + 2sin(2t)
y(t) = cos(t) - 2cos(2t)
z(t) = -sin(3t)
Each equation is represented by a module. Given an input value of t, they return values for x, y, and z.
These x,y,z values are used to translate a "point", which here is a cube. Chain hull connects the points.
These x,y,z values are used to translate a "point", which here is a cube. Hulling the loop connects the points.
To make the rainbow color, each cube is given a different hue in the chain hull loop. Since the hue can run between 0 and 100, and the loop runs between 0 and 360, i is divided by (360 / 100) = 3.6. You can get the rainbow loop twice through if you divide by 1.8.</comment><value name="VALUE"><block type="math_number" id="2"><field name="NUM">10</field></block></value></block><block type="procedures_defreturn" id="28" x="-1913" y="-53"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">x</field><value name="RETURN"><block type="math_arithmetic" id="29"><field name="OP">ADD</field><value name="A"><block type="math_trig" id="30"><field name="OP">SIN</field><value name="NUM"><block type="variables_get" id="31"><field name="VAR">t</field></block></value></block></value><value name="B"><block type="math_arithmetic" id="32"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="33"><field name="NUM">2</field></block></value><value name="B"><block type="math_trig" id="34"><field name="OP">SIN</field><value name="NUM"><block type="math_arithmetic" id="35"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="36"><field name="NUM">2</field></block></value><value name="B"><block type="variables_get" id="37"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block></value></block><block type="procedures_defreturn" id="38" x="-1915" y="38"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">y</field><value name="RETURN"><block type="math_arithmetic" id="39"><field name="OP">MINUS</field><value name="A"><block type="math_trig" id="40"><field name="OP">COS</field><value name="NUM"><block type="variables_get" id="41"><field name="VAR">t</field></block></value></block></value><value name="B"><block type="math_arithmetic" id="42"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="43"><field name="NUM">2</field></block></value><value name="B"><block type="math_trig" id="44"><field name="OP">COS</field><value name="NUM"><block type="math_arithmetic" id="45"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="46"><field name="NUM">2</field></block></value><value name="B"><block type="variables_get" id="47"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block></value></block><block type="procedures_defreturn" id="48" x="-1909" y="128"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">z</field><value name="RETURN"><block type="math_single" id="49"><field name="OP">NEG</field><value name="NUM"><block type="math_trig" id="50"><field name="OP">SIN</field><value name="NUM"><block type="math_arithmetic" id="51"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="52"><field name="NUM">3</field></block></value><value name="B"><block type="variables_get" id="53"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block><block type="scale" id="3" x="-1903" y="197"><value name="XVAL"><block type="variables_get" id="4"><field name="VAR">size</field></block></value><value name="YVAL"><block type="variables_get" id="5"><field name="VAR">size</field></block></value><value name="ZVAL"><block type="variables_get" id="6"><field name="VAR">size</field></block></value><statement name="A"><block type="controls_for_chainhull" id="7"><field name="VAR">i</field><value name="FROM"><block type="math_number" id="8"><field name="NUM">1</field></block></value><value name="TO"><block type="math_number" id="9"><field name="NUM">362</field></block></value><value name="BY"><block type="math_number" id="10"><field name="NUM">8</field></block></value><statement name="DO"><block type="translate" id="11" inline="false"><value name="XVAL"><block type="procedures_callreturn" id="12" inline="true"><mutation name="x"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="13"><field name="VAR">i</field></block></value></block></value><value name="YVAL"><block type="procedures_callreturn" id="14" inline="true"><mutation name="y"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="15"><field name="VAR">i</field></block></value></block></value><value name="ZVAL"><block type="procedures_callreturn" id="16" inline="true"><mutation name="z"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="17"><field name="VAR">i</field></block></value></block></value><statement name="A"><block type="color_rgb" id="18"><field name="SCHEME">HSV</field><value name="RED"><block type="math_arithmetic" id="19"><field name="OP">DIVIDE</field><value name="A"><block type="variables_get" id="20"><field name="VAR">i</field></block></value><value name="B"><block type="math_number" id="21"><field name="NUM">3.6</field></block></value></block></value><value name="GREEN"><block type="math_number" id="23"><field name="NUM">100</field></block></value><value name="BLUE"><block type="math_number" id="22"><field name="NUM">100</field></block></value><statement name="A"><block type="cube" id="24"><field name="CENTERDROPDOWN">true</field><value name="XVAL"><block type="math_number" id="25"><field name="NUM">0.75</field></block></value><value name="YVAL"><block type="math_number" id="26"><field name="NUM">0.75</field></block></value><value name="ZVAL"><block type="math_number" id="27"><field name="NUM">0.75</field></block></value></block></statement></block></statement></block></statement></block></statement></block></xml>
\ No newline at end of file
To make the rainbow color, each cube is given a different hue in the chain hull loop. Since the hue can run between 0 and 100, and the loop runs between 0 and 360, i is divided by (360 / 100) = 3.6. You can get the rainbow loop twice through if you divide by 1.8.</comment><value name="VALUE"><block type="math_number" id="795"><field name="NUM">10</field></block></value></block><block type="procedures_defreturn" id="796" x="-1913" y="-53"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">x</field><value name="RETURN"><block type="math_arithmetic" id="797"><field name="OP">ADD</field><value name="A"><block type="math_trig" id="798"><field name="OP">SIN</field><value name="NUM"><block type="variables_get" id="799"><field name="VAR">t</field></block></value></block></value><value name="B"><block type="math_arithmetic" id="800"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="801"><field name="NUM">2</field></block></value><value name="B"><block type="math_trig" id="802"><field name="OP">SIN</field><value name="NUM"><block type="math_arithmetic" id="803"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="804"><field name="NUM">2</field></block></value><value name="B"><block type="variables_get" id="805"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block></value></block><block type="procedures_defreturn" id="806" x="-1915" y="38"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">y</field><value name="RETURN"><block type="math_arithmetic" id="807"><field name="OP">MINUS</field><value name="A"><block type="math_trig" id="808"><field name="OP">COS</field><value name="NUM"><block type="variables_get" id="809"><field name="VAR">t</field></block></value></block></value><value name="B"><block type="math_arithmetic" id="810"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="811"><field name="NUM">2</field></block></value><value name="B"><block type="math_trig" id="812"><field name="OP">COS</field><value name="NUM"><block type="math_arithmetic" id="813"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="814"><field name="NUM">2</field></block></value><value name="B"><block type="variables_get" id="815"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block></value></block><block type="procedures_defreturn" id="816" x="-1909" y="128"><mutation statements="false"><arg name="t"></arg></mutation><field name="NAME">z</field><value name="RETURN"><block type="math_single" id="817"><field name="OP">NEG</field><value name="NUM"><block type="math_trig" id="818"><field name="OP">SIN</field><value name="NUM"><block type="math_arithmetic" id="819"><field name="OP">MULTIPLY</field><value name="A"><block type="math_number" id="820"><field name="NUM">3</field></block></value><value name="B"><block type="variables_get" id="821"><field name="VAR">t</field></block></value></block></value></block></value></block></value></block><block type="scale" id="822" x="-1916" y="221"><value name="XVAL"><block type="variables_get" id="823"><field name="VAR">size</field></block></value><value name="YVAL"><block type="variables_get" id="824"><field name="VAR">size</field></block></value><value name="ZVAL"><block type="variables_get" id="825"><field name="VAR">size</field></block></value><statement name="A"><block type="controls_for" id="826"><field name="VAR">i</field><field name="HULL">TRUE</field><value name="FROM"><block type="math_number" id="827"><field name="NUM">0</field></block></value><value name="TO"><block type="math_number" id="828"><field name="NUM">365</field></block></value><value name="BY"><block type="math_number" id="829"><field name="NUM">15</field></block></value><statement name="DO"><block type="translate" id="830" inline="false"><value name="XVAL"><block type="procedures_callreturn" id="831" inline="true"><mutation name="x"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="832"><field name="VAR">i</field></block></value></block></value><value name="YVAL"><block type="procedures_callreturn" id="833" inline="true"><mutation name="y"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="834"><field name="VAR">i</field></block></value></block></value><value name="ZVAL"><block type="procedures_callreturn" id="835" inline="true"><mutation name="z"><arg name="t"></arg></mutation><value name="ARG0"><block type="variables_get" id="836"><field name="VAR">i</field></block></value></block></value><statement name="A"><block type="color_rgb" id="837"><mutation plus="0" isrgb="false"></mutation><field name="SCHEME">HSV</field><value name="RED"><block type="math_arithmetic" id="838"><field name="OP">DIVIDE</field><value name="A"><block type="variables_get" id="839"><field name="VAR">i</field></block></value><value name="B"><block type="math_number" id="840"><field name="NUM">3.6</field></block></value></block></value><value name="GREEN"><block type="math_number" id="841"><field name="NUM">100</field></block></value><value name="BLUE"><block type="math_number" id="842"><field name="NUM">100</field></block></value><statement name="A"><block type="cube" id="843"><field name="CENTERDROPDOWN">true</field><value name="XVAL"><block type="math_number" id="844"><field name="NUM">0.6</field></block></value><value name="YVAL"><block type="math_number" id="845"><field name="NUM">0.6</field></block></value><value name="ZVAL"><block type="math_number" id="846"><field name="NUM">0.6</field></block></value></block></statement></block></statement></block></statement></block></statement></block></xml>
\ No newline at end of file
imgs/de/torus.svg 0 → 100644
View file @ 681f75d0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="173.33546mm"
height="74.702179mm"
viewBox="0 0 614.18078 264.69276"
id="svg4208"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="torus.svg">
<defs
id="defs4210" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.71402898"
inkscape:cx="489.58952"
inkscape:cy="-2.4141017"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:snap-object-midpoints="true"
inkscape:snap-global="false"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:window-width="1858"
inkscape:window-height="1178"
inkscape:window-x="54"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata4213">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-116.87792,-294.77042)">
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 329.38909,434.73022 30.72177,0"
id="path4815"
inkscape:connector-curvature="0" />
<path
transform="matrix(0.91753694,-0.37537428,0.37537428,0.91753694,-150.34624,124.01264)"
d="m 340.14171,534.55027 -94.19974,39.01881 -94.19974,-39.01881 -39.01881,-94.19974 39.01881,-94.19975 94.19974,-39.01881 94.19974,39.01881 39.01881,94.19974 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="true"
sodipodi:arg2="1.1780972"
sodipodi:arg1="0.78539816"
sodipodi:r2="123.07789"
sodipodi:r1="133.21855"
sodipodi:cy="440.35052"
sodipodi:cx="245.94197"
sodipodi:sides="8"
id="path4762"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:3.02616858;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
sodipodi:type="star" />
<path
sodipodi:type="star"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.04611969;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4760"
sodipodi:sides="8"
sodipodi:cx="245.94197"
sodipodi:cy="440.35052"
sodipodi:r1="133.21855"
sodipodi:r2="123.07789"
sodipodi:arg1="0.78539816"
sodipodi:arg2="1.1780972"
inkscape:flatsided="true"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 340.14171,534.55027 -94.19974,39.01881 -94.19974,-39.01881 -39.01881,-94.19974 39.01881,-94.19975 94.19974,-39.01881 94.19974,39.01881 39.01881,94.19974 z"
transform="matrix(0.90467875,-0.37011385,0.37011385,0.90467875,-144.86744,128.38099)" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 331.95058,352.20949 40.51645,-29.14341"
id="path4764"
inkscape:connector-curvature="0" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="339"
y="321.36221"
id="text4770"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4772"
x="339"
y="321.36221">seiten</tspan></text>
<path
sodipodi:type="star"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.38476801;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4783"
sodipodi:sides="8"
sodipodi:cx="245.94197"
sodipodi:cy="440.35052"
sodipodi:r1="133.21855"
sodipodi:r2="123.07789"
sodipodi:arg1="0.78539816"
sodipodi:arg2="1.1780972"
inkscape:flatsided="true"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 340.14171,534.55027 -94.19974,39.01881 -94.19974,-39.01881 -39.01881,-94.19974 39.01881,-94.19975 94.19974,-39.01881 94.19974,39.01881 39.01881,94.19974 z"
transform="matrix(0.42216167,-0.1727109,0.1727109,0.42216167,60.730254,292.30797)" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 152.61086,437.73022 86.38914,0"
id="path4785"
inkscape:connector-curvature="0" />
<ellipse
ry="3.0157323"
rx="2.7644215"
cy="437.73022"
cx="152.61086"
id="path4146"
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<ellipse
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="ellipse4793"
cx="239.36087"
cy="437.73022"
rx="2.7644215"
ry="3.0157323" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.68268204px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="190.21036"
y="431.29523"
id="text4167"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4169"
x="190.21036"
y="431.29523"
style="font-size:35px">r1</tspan></text>
<ellipse
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="ellipse4813"
cx="330.28763"
cy="435.04303"
rx="2.7644215"
ry="3.0157323" />
<text
sodipodi:linespacing="125%"
id="text4817"
y="425.5343"
x="323.35757"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.68268204px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
y="425.5343"
x="323.35757"
id="tspan4819"
sodipodi:role="line"
style="font-size:35px">r2</tspan></text>
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 639.63782,524.80961 c -21.45897,7.45698 -45.85229,11.67212 -71.72118,11.67212 -85.86848,0 -155.47862,-46.44328 -155.47862,-103.73396 0,-57.29068 69.61014,-103.73396 155.47862,-103.73396 30.8436,0 59.58954,5.99219 83.76525,16.32692"
id="path4832"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 490.78998,421.6563 c 23.07077,24.44588 84.71215,29.52736 124.19829,17.315"
id="path4834"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 490.78998,421.6563 c 25.21518,-32.22099 94.42662,-39.76624 133.36803,-18.41115"
id="path4836"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 615.27814,439.38129 19.64323,26.93031 7.56512,41.84662 -2.87764,15.83035"
id="path4838"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 624.49074,402.74965 -5.95432,-20.01459 11.44365,-26.78009 20.96736,-11.34328 5.78393,17.27802 -10.49864,28.34127 z"
id="path4840"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 634.92137,466.3116 c -65.58762,24.12547 -244.66783,0.28696 -197.98964,-90.50394"
id="path4849"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 642.48649,508.15822 C 538.51938,541.28526 439.68652,494.70401 420.10005,463.73636"
id="path4851"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 629.98007,355.95497 C 499.80179,308.10499 416.9644,404.72667 503.61658,432.31916"
id="path4853"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 618.53642,382.73506 C 562.00323,358.40385 486.15794,380.87966 490.78998,421.6563"
id="path4855"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path4857"
d="m 623.3361,404.40755 -6.46524,-21.20819 12.4256,-28.37714 22.76653,-12.0198 6.28023,18.30846 -11.39952,30.03144 z"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 638.42775,396.84132 16.77164,28.59632"
id="path4859"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="641.79846"
y="455.7511"
id="text4770-4"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4772-9"
x="641.79846"
y="455.7511">faces</tspan></text>
</g>
</svg>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment