Changeset 1347

Timestamp:

08/27/25 18:15:39 (25 hours ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/common/Convert.h (modified) (1 diff)
• cpp/common/nonstd_math.cpp (modified) (1 diff)
• cpp/frams/genetics/f9/f9_conv.cpp (modified) (1 diff)
• framspy/frams.py (modified) (4 diffs)

cpp/common/Convert.h

@@ -6 +6 @@
 #define _CONVERT_H_
 
+#include "nonstd_math.h"
 #include "nonstd.h"
-#include "nonstd_math.h"
 #include "nonstd_stl.h"
 #include <stdint.h>

cpp/common/nonstd_math.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2025  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "nonstd_math.h"
+#ifdef USE_PRINTFLOAT_DRAGON4
 #include <PrintFloat/PrintFloat.h>
+#endif
 #include <string.h> // strncpy()
 #include <sstream>

cpp/frams/genetics/f9/f9_conv.cpp

@@ -154 +154 @@
                         double ax = fabs(d.x), ay = fabs(d.y), az = fabs(d.z);
                         // Pairs of colors should be easy to associate as "one family" at a glance, but different so that we use all main six parts of the spectrum.
-                        // Colors are slightly brightened to make them more pastel/plastic; extreme saturation pure red=1,0,0 or blue 0,0,1 do not look good.
+                        // Colors are slightly brightened to make them more pastel/plastic; extreme saturation pure red=1,0,0 or blue=0,0,1 do not look good.
                         // Find the longest axis (i.e., recover the information from the genotype: was this joint created by LR, BF, or DU?)
                         if ((ax > ay) && (ax > az)) // x

framspy/frams.py

@@ -27 +27 @@
 import ctypes, re, sys, os
 
-c_api = None  # will be initialized in init(). Global because ExtValue uses it.
+c_api = None  # will be initialized in init(). This variable is global because all ExtValue objects use it extensively.
 
 
@@ -320 +320 @@
         Similarly '-dPATH' and '-DPATH' needed by Framsticks are optional and derived from the first path, unless they are specified as args in init().
         '-LNAME' is the optional library name (full name including the file name extension), default is 'frams-objects.dll/.so/.dylib' depending on the platform.
-        All other arguments are passed to Framsticks and not interpreted by this function.
+        All other arguments are passed to Framsticks and are not interpreted by this function.
         """
 
@@ -359 +359 @@
                         initargs.append(a)
         if lib_path is None:
-                # TODO: use environment variable and/or the zip distribution we are in when the path is not specified in arg
-                # for now just assume the current dir is Framsticks
+                # TODO: use environment variable and/or the zip distribution we are in when the path is not specified in arg.
+                # For now, just assume the current dir is Framsticks.
                 lib_path = '.'
 
@@ -378 +378 @@
         initargs.insert(0, frams_d)
         initargs.insert(0, frams_D)
-        initargs.insert(0, 'dummy.exe')  # as an offset, 0th arg is by convention app name
+        initargs.insert(0, 'dummy.exe')  # as an offset, 0th arg is by convention the app name
 
         global c_api  # access global variable