Merge branch 'development'

blockly/openscad_compressed.js

@@ -52,8 +52,8 @@ Blockly.OpenSCAD.math_single=function(a){var b=a.getFieldValue("OP"),c,d;if("NEG
 ")";break;case "ASIN":c="asin("+d+")";break;case "ACOS":c="acos("+d+")";break;case "ATAN":c="atan("+d+")";break;default:throw"Unknown math operator: "+b;}return a.getParent()?[c,Blockly.OpenSCAD.ORDER_DIVISION]:["//"+c,Blockly.OpenSCAD.ORDER_DIVISION]};
 Blockly.OpenSCAD.math_constant_bs=function(a){var b={PI:["3.14159",Blockly.OpenSCAD.ORDER_MEMBER],E:["2.71828",Blockly.OpenSCAD.ORDER_MEMBER],GOLDEN_RATIO:["(1 + sqrt(5)) / 2",Blockly.OpenSCAD.ORDER_DIVISION],SQRT2:["sqrt(2)",Blockly.OpenSCAD.ORDER_MEMBER],SQRT1_2:["sqrt(1/2)",Blockly.OpenSCAD.ORDER_MEMBER]};return a.getParent()?b[a.getFieldValue("CONSTANT")]:"//"+b[a.getFieldValue("CONSTANT")]};
 Blockly.OpenSCAD.math_constant=function(a){var b={PI:["3.14159",Blockly.OpenSCAD.ORDER_MEMBER],E:["2.71828",Blockly.OpenSCAD.ORDER_MEMBER],GOLDEN_RATIO:["(1 + sqrt(5)) / 2",Blockly.OpenSCAD.ORDER_DIVISION],SQRT2:["sqrt(2)",Blockly.OpenSCAD.ORDER_MEMBER],SQRT1_2:["sqrt(1/2)",Blockly.OpenSCAD.ORDER_MEMBER]};return a.getParent()?b[a.getFieldValue("CONSTANT")]:"//"+b[a.getFieldValue("CONSTANT")]};
-Blockly.OpenSCAD.math_number_property=function(a){var b=Blockly.OpenSCAD.valueToCode(a,"NUMBER_TO_CHECK",Blockly.OpenSCAD.ORDER_MODULUS)||"0",c=a.getFieldValue("PROPERTY"),d;if("PRIME"==c)return d=Blockly.OpenSCAD.provideFunction_("math_isPrime",["function "+Blockly.OpenSCAD.FUNCTION_NAME_PLACEHOLDER_+"(n) =","  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods","  if (n == 2 || n == 3) {","    1;","  }","  // False if n is NaN, negative, is 1, or not whole.","  // And false if n is divisible by 2 or 3.",
-"  // Cant check for NaN in openscad.","  if ( n <= 1 || n % 1 != 0 || n % 2 == 0 || n % 3 == 0) {","    0","  }","  // Check all the numbers of form 6k +/- 1, up to sqrt(n).","  for (x = [6:6:sqrt(n)]) {","    if (n % (x - 1) == 0 || n % (x + 1) == 0) {","      0;","    }","  }","  1;","}"])+"("+b+")",[d,Blockly.OpenSCAD.ORDER_FUNCTION_CALL];switch(c){case "EVEN":d=b+" % 2 == 0";break;case "ODD":d=b+" % 2 == 1";break;case "WHOLE":d=b+" % 1 == 0";break;case "POSITIVE":d=b+" > 0";break;case "NEGATIVE":d=
+Blockly.OpenSCAD.math_number_property=function(a){var b=Blockly.OpenSCAD.valueToCode(a,"NUMBER_TO_CHECK",Blockly.OpenSCAD.ORDER_MODULUS)||"0",c=a.getFieldValue("PROPERTY"),d;if("PRIME"==c)return[Blockly.OpenSCAD.provideFunction_("math_isPrime",["function "+Blockly.OpenSCAD.FUNCTION_NAME_PLACEHOLDER_+"(n) =","  // https://en.wikipedia.org/wiki/Primality_test#Naive_methods","  if (n == 2 || n == 3) {","    1;","  }","  // False if n is NaN, negative, is 1, or not whole.","  // And false if n is divisible by 2 or 3.",
+"  // Cant check for NaN in openscad.","  if ( n <= 1 || n % 1 != 0 || n % 2 == 0 || n % 3 == 0) {","    0","  }","  // Check all the numbers of form 6k +/- 1, up to sqrt(n).","  for (x = [6:6:sqrt(n)]) {","    if (n % (x - 1) == 0 || n % (x + 1) == 0) {","      0;","    }","  }","  1;","}"])+"("+b+")",Blockly.OpenSCAD.ORDER_FUNCTION_CALL];switch(c){case "EVEN":d=b+" % 2 == 0";break;case "ODD":d=b+" % 2 == 1";break;case "WHOLE":d=b+" % 1 == 0";break;case "POSITIVE":d=b+" > 0";break;case "NEGATIVE":d=
 b+" < 0";break;case "DIVISIBLE_BY":c=Blockly.OpenSCAD.valueToCode(a,"DIVISOR",Blockly.OpenSCAD.ORDER_MODULUS)||"0",d=b+" % "+c+" == 0"}return a.getParent()?[d,Blockly.OpenSCAD.ORDER_EQUALITY]:["//"+d,Blockly.OpenSCAD.ORDER_EQUALITY]};
 Blockly.OpenSCAD.math_change=function(a){var b=Blockly.OpenSCAD.valueToCode(a,"DELTA",Blockly.OpenSCAD.ORDER_ADDITION)||"0";a=Blockly.OpenSCAD.variableDB_.getName(a.getFieldValue("VAR"),Blockly.Variables.NAME_TYPE);return a+" = (typeof "+a+" == 'number' ? "+a+" : 0) + "+b+";\n"};Blockly.OpenSCAD.math_round=Blockly.OpenSCAD.math_single;Blockly.OpenSCAD.math_trig=Blockly.OpenSCAD.math_single;
 Blockly.OpenSCAD.math_on_list=function(a){var b=a.getFieldValue("OP");switch(b){case "SUM":b=Blockly.OpenSCAD.valueToCode(a,"LIST",Blockly.OpenSCAD.ORDER_MEMBER)||"[]";b+=".reduce(function(x, y) {return x + y;})";break;case "MIN":b=Blockly.OpenSCAD.valueToCode(a,"LIST",Blockly.OpenSCAD.ORDER_COMMA)||"[]";b="Math.min.apply(null, "+b+")";break;case "MAX":b=Blockly.OpenSCAD.valueToCode(a,"LIST",Blockly.OpenSCAD.ORDER_COMMA)||"[]";b="Math.max.apply(null, "+b+")";break;case "AVERAGE":var c=Blockly.OpenSCAD.provideFunction_("math_mean",

blockscad/text.js

@@ -33,6 +33,7 @@ Blockscad.fontList = ['/fonts/Roboto/Roboto-Bold.ttf',
                       '/fonts/nimbus/nimbus-sans-l_bold.ttf',
                       '/fonts/AverageMono/AverageMonoSimp.ttf',
                       '/fonts/Open_Sans/OpenSans-ExtraBold.ttf',
+                      '/fonts/stardos-stencil/StardosStencil-Bold.ttf',
                       '/fonts/Chewy/Chewy.ttf',
                       '/fonts/bangers/Bangers.ttf'];
 
@@ -42,6 +43,7 @@ Blockscad.fontName = ['Roboto',
                       'Nimbus Sans',
                       'Average Mono',
                       'Open Sans',
+                      'Stardos Stencil',
                       'Chewy',
                       'Bangers']; 
 

fonts/stardos-stencil/OFL.txt

+Copyright (c) 2011 by vernon adams (vern@newtypography.co.uk),
+with Reserved Font Names "Stardos" and "Stardos Stencil".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

openscad-openjscad-translator/src/Context.js

@@ -134,6 +134,16 @@ define("Context", ["Globals", "openscad-parser-support"], function(Globals, Open
         return parseInt(Math.ceil(Math.max(Math.min(360.0 / fa, r*2*Math.PI / fs), 5)));
     };
 
+    Context.get_font_resolution = function(context) {
+        var fn = Context.contextVariableLookup(context, "$fn", Globals.FN_DEFAULT);
+        var fs = Context.contextVariableLookup(context, "$fs", Globals.FS_DEFAULT);
+        var fa = Context.contextVariableLookup(context, "$fa", Globals.FA_DEFAULT);
+
+        if (fn > 0.0)
+            return parseInt(fn);
+        return 3;     
+    };
+
     function rad2deg(rad){
         return rad * (180/Math.PI);
     };

openscad-openjscad-translator/src/PrimitiveModules.js

@@ -148,9 +148,9 @@ define("PrimitiveModules", ["Globals", "Context"], function(Globals, Context){
         var size = Context.contextVariableLookup(context,"size","20");
         var font = Context.contextVariableLookup(context,"font","");
 
-        var dummy_size = Math.ceil(size / 10);
+        // var dummy_size = Math.ceil(size / 100);
 
-        var resolution = Context.get_fragments_from_r(dummy_size, context);
+        var resolution = Context.get_font_resolution(context);
 
         if (Blockscad.fonts[font]) {
             // Use your font here.