scriptup 2024.0.4 → 2024.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9871b18e42098d2ec1b6cfbee5ac96588e4b0ef4f17d545f428bfda6ec39327
-  data.tar.gz: 71b6b85079deb4b1db998411ca321b8bb130a916f352e09d93227bd91505d413
+  metadata.gz: 7bfb2ee4c449272de70df28c0f673a2f6d3288bd1ca499899839dab5ad774ec1
+  data.tar.gz: b63caaa6e708d9cf377f3447ff2e9c50ac006ca0055be7d75ff35fa02f73eea0
 SHA512:
-  metadata.gz: 1432395ce8e79fd386c31af579e1e3a6b2793eeb358f010da2fef9ffb859c120fe4ac7eff2cad9f12dcea740f541cd465f66244e4f7cc91fcb37a730cbe3ae14
-  data.tar.gz: 3cb7f77c6df049ebdc44b98f9e46abb0720a793a4940623f1d5e9ccb6955cd9b6ca6c4c91857c344fd4c82de0c9b1f58110f7efbabbc4df4933cb6efdf996363
+  metadata.gz: c986c9d97ea409612e2bc83fed57b52b66cc9dfe8a8681e3c5447d02552dcde03bd9b856bce2f88829c32b635255874bb654ff30803213748c4562f97e557fad
+  data.tar.gz: ca1b23690c4a780b99927eed9ee9010b2c164d630bd264d0262936b96e71939226dc0aa263ee53b7c753cd57855d40684d28a7f2c2775802efbf7d52d8bde3ab

data/ext/attribute_dictionaries.c

@@ -30,7 +30,7 @@ static VALUE Sketchup_AttributeDictionaries_length(VALUE self)
 	SUModelRef model = {DATA_PTR(self)};
 	size_t count;
 	SUModelGetNumAttributeDictionaries(model, &count);
-	return INT2NUM(count);
+	return ULL2NUM(count);
 }
 
 VALUE AttributeDictionaries_Init(VALUE Sketchup, VALUE Sketchup_Entity)

data/ext/color.c

@@ -41,20 +41,20 @@ static VALUE Sketchup_Color_names(VALUE self)
 	size_t count = 0;
 	SUColorGetNumNames(&count);
 	SUStringRef* names = malloc(count * sizeof(SUStringRef));
-	for (int i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		names[i].ptr = 0;
 		SUStringCreate(&names[i]);
 	}
 	SUColorGetNames(names, count);
 	VALUE ary = rb_ary_new2(count);
-	for (int i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		VALUE name;
 		GETUTF8FROMSTRING(names[i], name);
 		rb_ary_push(ary, name);
 	}
-	for (int i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		SUStringRelease(&names[i]);
 	}

data/ext/component_definition.c

@@ -61,7 +61,7 @@ static VALUE Sketchup_ComponentDefinition_count_instances(VALUE self)
 	SUComponentDefinitionRef definition = {DATA_PTR(self)};
 	size_t count = 0;
 	SUComponentDefinitionGetNumInstances(definition, &count);
-	return INT2NUM(count);
+	return ULL2NUM(count);
 }
 
 static VALUE Sketchup_ComponentDefinition_count_used_instances(VALUE self)
@@ -69,7 +69,7 @@ static VALUE Sketchup_ComponentDefinition_count_used_instances(VALUE self)
 	SUComponentDefinitionRef definition = {DATA_PTR(self)};
 	size_t count = 0;
 	SUComponentDefinitionGetNumUsedInstances(definition, &count);
-	return INT2NUM(count);
+	return ULL2NUM(count);
 }
 
 static VALUE Sketchup_ComponentDefinition_live_component(VALUE self)

data/ext/definition_list.c

@@ -28,7 +28,7 @@ static VALUE Sketchup_DefinitionList_count(VALUE self)
 	size_t gd_count = 0;
 	SUModelGetNumComponentDefinitions(model, &cd_count);
 	SUModelGetNumGroupDefinitions(model, &gd_count);
-	return INT2NUM(cd_count + gd_count);
+	return ULL2NUM(cd_count + gd_count);
 }
 
 static VALUE Sketchup_DefinitionList_load(VALUE self, VALUE path)

data/ext/entity.c

@@ -111,13 +111,13 @@ static VALUE Sketchup_Entity_remove_observer(VALUE self, VALUE observer)
 	return RTEST(result) ? Qtrue : Qfalse;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
 static VALUE Sketchup_Entity_add_observer(VALUE self, VALUE observer)
 {
 	VALUE observers = Qnil;
-	#pragma clang diagnostic push
-	#pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
 	if (RTEST(rb_ivar_defined(self, rb_intern("@observers"))))
-	#pragma clang diagnostic pop
 	{
 		observers = rb_iv_get(self, "@observers");
 	}
@@ -129,6 +129,7 @@ static VALUE Sketchup_Entity_add_observer(VALUE self, VALUE observer)
 	rb_hash_aset(self, observer, observer);
 	return Qtrue;
 }
+#pragma clang diagnostic pop
 
 void Sketchup_Entity_attribute_dictionaries_Iterator(SUAttributeDictionaryRef dictionary, VALUE* ary)
 {

data/ext/material.c

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <material.h>
 #include <SketchUpAPI/sketchup.h>
+#include <SketchUpAPI/model/material.h>
 #include <utils.h>
 
 static int GETCOLOR(VALUE obj)
@@ -25,11 +26,6 @@ static float GETALPHA(VALUE obj)
 		return alpha;
 }
 
-static void dealloc(SUColor* ptr)
-{
-	free(ptr);
-}
-
 static VALUE VALUE2COLOR(VALUE obj)
 {
 	if (rb_obj_is_kind_of(obj, rb_path2class(SKETCHUP_COLOR)))
@@ -54,7 +50,7 @@ static VALUE VALUE2COLOR(VALUE obj)
 		rb_raise(rb_eTypeError, "no implicit conversion to Color");
 }
 
-static VALUE VALUE2COLORIZATION(VALUE obj)
+static enum SUMaterialColorizeType VALUE2COLORIZATION(VALUE obj)
 {
 	int colorization = NUM2INT(obj);
 	if (colorization < 0)
@@ -130,7 +126,8 @@ static VALUE Sketchup_Material_Get_color(VALUE self)
 static VALUE Sketchup_Material_Set_color(VALUE self, VALUE color)
 {
 	SUMaterialRef material = {DATA_PTR(self)};
-	VALUE valueColor = VALUE2COLOR(color);
+	VALUE2COLOR(color);
+	SUMaterialSetColor(material, DATA_PTR(VALUE2COLOR(color)));
 	return color;
 }
 

data/ext/utils.h

@@ -39,7 +39,7 @@
 	SUGetNum(ref, &num); \
 	SURef* array = malloc(num * sizeof(SURef)); \
 	SUGet(ref, num, array, &num); \
-	for( int i = 0; i < num; i++) \
+	for(size_t i = 0; i < num; i++) \
 		callback(array[i], userdata); \
 	free(array); \
 }
@@ -48,15 +48,15 @@
 	size_t num; \
 	SUGetNum(ref, &num); \
 	SURef* array = malloc(num * sizeof(SURef)); \
-	for (int i = 0; i < num; i++) \
+	for (size_t i = 0; i < num; i++) \
 	{ \
 		array[i].ptr = 0; \
 		SUStringCreate(&array[i]); \
 	} \
 	SUGet(ref, num, array, &num); \
-	for (int i = 0; i < num; i++) \
+	for (size_t i = 0; i < num; i++) \
 		callback(array[i], userdata); \
-	for (int i = 0; i < num; i++) \
+	for (size_t i = 0; i < num; i++) \
 		SUStringRelease(&array[i]); \
 	free(array); \
 }

data/sketchup-sdk-win/headers/LayOutAPI/application/application.h

@@ -0,0 +1,117 @@
+// Copyright 2014-2022 Trimble Inc. All Rights Reserved.
+
+#ifndef LAYOUT_APPLICATION_APPLICATION_H_
+#define LAYOUT_APPLICATION_APPLICATION_H_
+
+#include <LayOutAPI/common.h>
+#include <LayOutAPI/model/defs.h>
+
+
+/**
+@struct LOApplicationRef
+@brief Encapsulates a LayOut application.
+@since LayOut 2018, API 3.0
+*/
+
+DEFINE_SU_TYPE(LOApplicationRef)
+
+#pragma pack(push, 8)
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+
+/**
+@brief Gets the application instance.
+@since LayOut 2018, API 3.0
+@param[out] app The application instance.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_NO_DATA if we are not running inside an instance of the LayOut
+  application
+*/
+LO_RESULT LOApplicationGetApplication(LOApplicationRef* app);
+
+/**
+@brief Gets a reference to the active document.
+@since LayOut 2018, API 3.0
+@param[in]  app      The application instance.
+@param[out] document The active document.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+- \ref SU_ERROR_NULL_POINTER_OUTPUT if document is NULL
+*/
+LO_RESULT LOApplicationGetActiveDocument(LOApplicationRef app, LODocumentRef* document);
+
+/**
+@brief Gets the major/minor version number as a string.
+@since LayOut 2018, API 3.0
+@param[in]  app     The application instance.
+@param[out] version The current version of the application.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+- \ref SU_ERROR_NULL_POINTER_OUTPUT if version is NULL
+*/
+LO_RESULT LOApplicationGetVersion(LOApplicationRef app, SUStringRef* version);
+
+/**
+@brief Gets the major/minor version number as an unsigned integer.
+@since LayOut 2018, API 3.0
+@param[in]  app     The application instance.
+@param[out] version The current version of the application.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+- \ref SU_ERROR_NULL_POINTER_OUTPUT if version is NULL
+*/
+LO_RESULT LOApplicationGetVersionNumber(LOApplicationRef app, unsigned int* version);
+
+/**
+@brief Gets whether the application is connected to the internet.
+@since LayOut 2018, API 3.0
+@param[in]  app       The application instance.
+@param[out] is_online True if the application is connected to the internet.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+- \ref SU_ERROR_NULL_POINTER_OUTPUT if is_online is NULL
+*/
+LO_RESULT LOApplicationGetOnline(LOApplicationRef app, bool* is_online);
+
+/**
+@brief Opens the LayOut document located at the given file path.
+@since LayOut 2018, API 3.0
+@param[in]  app       The application instance.
+@param[in]  file_path The full file path to the .layout document to open.
+@param[out] document  A reference to the opened document if successful.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+- \ref SU_ERROR_NULL_POINTER_INPUT if file_path is NULL
+- \ref SU_ERROR_NULL_POINTER_OUTPUT if document is NULL
+- \ref SU_ERROR_SERIALIZATION if the document fails to open
+*/
+LO_RESULT LOApplicationOpenDocument(
+    LOApplicationRef app, const char* file_path, LODocumentRef* document);
+
+
+/**
+@brief Quits the application.
+@since LayOut 2018, API 3.0
+@param[in] app The application instance.
+@return
+- \ref SU_ERROR_NONE on success
+- \ref SU_ERROR_INVALID_INPUT if app is not a valid object
+*/
+LO_RESULT LOApplicationQuit(LOApplicationRef app);
+
+
+
+#ifdef __cplusplus
+}  // extern "C" {
+#endif
+#pragma pack(pop)
+
+#endif  // LAYOUT_APPLICATION_APPLICATION_H_

data/sketchup-sdk-win/headers/LayOutAPI/common.h

@@ -0,0 +1,22 @@
+// Copyright 2015 Trimble Navigation Ltd. All rights reserved.
+// This file is intended for public distribution.
+
+#ifndef LAYOUT_COMMON_H_
+#define LAYOUT_COMMON_H_
+
+#define LO_EXPORT
+#if (defined WIN32 || defined WIN64) && !defined LO_NO_EXPORTS
+  #undef LO_EXPORT
+  #ifdef LAYOUT_API_EXPORTS
+    #define LO_EXPORT __declspec(dllexport)
+  #else
+    #define LO_EXPORT __declspec(dllimport)
+  #endif  // LAYOUT_API_EXPORTS
+#endif    // WINDOWS
+
+#include <SketchUpAPI/common.h>
+#include <SketchUpAPI/unicodestring.h>
+
+#define LO_RESULT LO_EXPORT SUResult
+
+#endif  // LAYOUT_COMMON_H_

data/sketchup-sdk-win/headers/LayOutAPI/geometry/geometry.h

@@ -0,0 +1,78 @@
+// Copyright 2015 Trimble Navigation Ltd., All rights reserved.
+// This file is intended for public distribution.
+
+#ifndef LAYOUT_GEOMETRY_GEOMETRY_H_
+#define LAYOUT_GEOMETRY_GEOMETRY_H_
+
+#include <SketchUpAPI/geometry.h>
+
+#pragma pack(push, 8)
+
+/**
+@typedef LOPoint2D
+@brief Represents a point in 2-dimensional paper space.
+*/
+typedef SUPoint2D LOPoint2D;
+
+/**
+@typedef LOPoint3D
+@brief Represents a point in 3-dimensional model space.
+*/
+typedef SUPoint3D LOPoint3D;
+
+/**
+@typedef LOVector2D
+@brief Represents a vector in 2-dimensional paper space.
+@since LayOut 2017, API 2.0
+*/
+typedef SUVector2D LOVector2D;
+
+
+/**
+@struct LOAxisAlignedRect2D
+@brief Represents a 2D rectangle that is aligned with the X and Y axis of the
+       coordinate system.
+*/
+typedef SUAxisAlignedRect2D LOAxisAlignedRect2D;
+
+/**
+@struct LOOrientedRect2D
+@brief Represents a 2D rectangle that might be rotated. Each corner of the
+       rectangle is represented by a separate 2D point.
+*/
+struct LOOrientedRect2D {
+  LOPoint2D upper_left;
+  LOPoint2D upper_right;
+  LOPoint2D lower_right;
+  LOPoint2D lower_left;
+};
+
+/**
+@struct LOTransformMatrix2D
+@brief 2x3 matrix for representing 2D transforms on LayOut entities. The matrix
+       is stored in column-major format:
+<pre>
+ m11 m21 tx
+ m12 m22 ty
+</pre>
+*/
+typedef SUTransformation2D LOTransformMatrix2D;
+
+/**
+@typedef LOPoint2D
+@brief Represents a size in 2D space.
+*/
+typedef LOPoint2D LOSize2D;
+
+/**
+@struct LORect2D
+@brief Represents a 2D rectangle.
+*/
+struct LORect2D {
+  LOPoint2D origin;
+  LOSize2D size;
+};
+
+#pragma pack(pop)
+
+#endif  // LAYOUT_GEOMETRY_GEOMETRY_H_

data/sketchup-sdk-win/headers/LayOutAPI/initialize.h

@@ -0,0 +1,36 @@
+// Copyright 2015 Trimble Navigation Ltd. All Rights Reserved
+
+#ifndef LAYOUT_INITIALIZE_H_
+#define LAYOUT_INITIALIZE_H_
+
+#include <LayOutAPI/common.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+@brief Initializes the LayOut C API interface. Must be called before calling any
+other API function.
+*/
+LO_EXPORT void LOInitialize();
+
+/**
+@brief Signals termination of use of the LayOut C API interface. Must be called
+when done using API functions.
+*/
+LO_EXPORT void LOTerminate();
+
+/**
+@brief Returns the major and minor API version numbers.
+@param[out] major The major version number retrieved.
+@param[out] minor The minor version number retrieved.
+*/
+LO_EXPORT void LOGetAPIVersion(size_t* major, size_t* minor);
+
+
+#ifdef __cplusplus
+}  //  extern "C" {
+#endif
+
+#endif  // LAYOUT_INITIALIZE_H_

data/sketchup-sdk-win/headers/LayOutAPI/layout.h

@@ -0,0 +1,49 @@
+// Copyright 2015-2022 Trimble Inc. All rights reserved.
+// This file is intended for public distribution.
+
+#ifndef LAYOUT_LAYOUT_H_
+#define LAYOUT_LAYOUT_H_
+
+/*
+ *  The purpose of this file is to include all of the files needed to use the
+ *  C API.
+ */
+
+#include <LayOutAPI/common.h>
+#include <LayOutAPI/initialize.h>
+#include <LayOutAPI/application/application.h>
+#include <LayOutAPI/geometry/geometry.h>
+#include <LayOutAPI/model/angulardimension.h>
+#include <LayOutAPI/model/autotextdefinition.h>
+#include <LayOutAPI/model/autotextdefinitionlist.h>
+#include <LayOutAPI/model/connectionpoint.h>
+#include <LayOutAPI/model/defs.h>
+#include <LayOutAPI/model/dictionary.h>
+#include <LayOutAPI/model/document.h>
+#include <LayOutAPI/model/documentexportoptions.h>
+#include <LayOutAPI/model/ellipse.h>
+#include <LayOutAPI/model/entity.h>
+#include <LayOutAPI/model/entityiterator.h>
+#include <LayOutAPI/model/entitylist.h>
+#include <LayOutAPI/model/formattedtext.h>
+#include <LayOutAPI/model/grid.h>
+#include <LayOutAPI/model/group.h>
+#include <LayOutAPI/model/image.h>
+#include <LayOutAPI/model/imagerep.h>
+#include <LayOutAPI/model/label.h>
+#include <LayOutAPI/model/layer.h>
+#include <LayOutAPI/model/layerinstance.h>
+#include <LayOutAPI/model/layerlist.h>
+#include <LayOutAPI/model/lineardimension.h>
+#include <LayOutAPI/model/page.h>
+#include <LayOutAPI/model/pageinfo.h>
+#include <LayOutAPI/model/pagelist.h>
+#include <LayOutAPI/model/path.h>
+#include <LayOutAPI/model/rectangle.h>
+#include <LayOutAPI/model/referenceentity.h>
+#include <LayOutAPI/model/sketchupmodel.h>
+#include <LayOutAPI/model/style.h>
+#include <LayOutAPI/model/table.h>
+#include <LayOutAPI/model/typed_value.h>
+
+#endif  // LAYOUT_LAYOUT_H_