noobs 0.0.131 → 0.0.141

package/index.d.ts

@@ -147,6 +147,10 @@ export type SceneItemPosition = {
   y: number; // Y position in pixels
   scaleX: number; // X scaling factor
   scaleY: number; // Y scaling factor
+  cropLeft: number; // Pixels to crop from the left
+  cropRight: number; // Pixels to crop from the right
+  cropTop: number; // Pixels to crop from the top
+  cropBottom: number; // Pixels to crop from the bottom
 };
 
 export type SourceDimensions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobs",
-  "version": "0.0.131",
+  "version": "0.0.141",
   "description": "A native Node.js addon with libobs bindings for Warcraft Recorder.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/main.cpp

@@ -554,16 +554,24 @@ Napi::Value ObsGetSourcePos(const Napi::CallbackInfo& info) {
 
   std::string name = info[0].As<Napi::String>().Utf8Value();
 
-  vec2 pos; vec2 size; vec2 scale;
-  obs->getSourcePos(name, &pos, &size, &scale);
+  vec2 pos; vec2 size; vec2 scale; obs_sceneitem_crop crop;
+  obs->getSourcePos(name, &pos, &size, &scale, &crop);
 
   Napi::Object result = Napi::Object::New(info.Env());
+
   result.Set("x", Napi::Number::New(info.Env(), pos.x));
   result.Set("y", Napi::Number::New(info.Env(), pos.y));
+
   result.Set("width", Napi::Number::New(info.Env(), size.x));
   result.Set("height", Napi::Number::New(info.Env(), size.y));
   result.Set("scaleX", Napi::Number::New(info.Env(), scale.x));
   result.Set("scaleY", Napi::Number::New(info.Env(), scale.y));
+
+  result.Set("cropLeft", Napi::Number::New(info.Env(), crop.left));
+  result.Set("cropRight", Napi::Number::New(info.Env(), crop.right));
+  result.Set("cropTop", Napi::Number::New(info.Env(), crop.top));
+  result.Set("cropBottom", Napi::Number::New(info.Env(), crop.bottom));
+
   return result;
 }
 
@@ -593,7 +601,13 @@ Napi::Value ObsSetSourcePos(const Napi::CallbackInfo& info) {
   float scaleY = position.Get("scaleY").As<Napi::Number>().FloatValue();
   vec2 scale = { scaleX, scaleY };
 
-  obs->setSourcePos(name, &pos, &scale);
+  int cropLeft = position.Get("cropLeft").As<Napi::Number>().Int32Value();
+  int cropRight = position.Get("cropRight").As<Napi::Number>().Int32Value();
+  int cropTop = position.Get("cropTop").As<Napi::Number>().Int32Value();
+  int cropBottom = position.Get("cropBottom").As<Napi::Number>().Int32Value();
+  obs_sceneitem_crop crop = { cropLeft, cropTop, cropRight, cropBottom }; // Careful with ordering.
+
+  obs->setSourcePos(name, &pos, &scale, &crop);
   return info.Env().Undefined();
 }
 

package/src/obs_interface.cpp

@@ -597,14 +597,15 @@ void ObsInterface::disconnect_signal_handlers(obs_output_t *output) {
 
 bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
   // Get the item position and size
-  vec2 pos; vec2 scale;
+  vec2 pos; vec2 scale; obs_sceneitem_crop crop;
   obs_sceneitem_get_pos(item, &pos);
   obs_sceneitem_get_scale(item, &scale);
+  obs_sceneitem_get_crop(item, &crop);
 
   // Calculate actual size with scaling
   obs_source_t *src = obs_sceneitem_get_source(item);
-  float width =  obs_source_get_width(src) * scale.x;
-  float height = obs_source_get_height(src) * scale.y;
+  float width =  (obs_source_get_width(src) - crop.left - crop.right) * scale.x;
+  float height = (obs_source_get_height(src) - crop.top - crop.bottom) * scale.y;
 
   if (width <= 0 || height <= 0) {
     // Don't want to call gs_draw_sprite with zero width or height.
@@ -634,7 +635,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Bottom border
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x, pos.y + height - 4.0f, 0.0f);
+  gs_matrix_translate3f(pos.x, pos.y  + height - 4.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, width, 4.0f);
   gs_matrix_pop();
 
@@ -652,7 +653,7 @@ bool draw_source_outline(obs_scene_t *scene, obs_sceneitem_t *item, void *p) {
 
   // Dragging point box (25x25 pixels in bottom-right corner)
   gs_matrix_push();
-  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y + height - 25.0f, 0.0f);
+  gs_matrix_translate3f(pos.x + width - 25.0f, pos.y  + height - 25.0f, 0.0f);
   gs_draw_sprite(nullptr, 0, 25.0f, 25.0f);
   gs_matrix_pop();
 
@@ -1164,7 +1165,7 @@ void ObsInterface::removeSourceFromScene(std::string name) {
   blog(LOG_INFO, "ObsInterface::removeSourceFromScene exited");
 }
 
-void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale) 
+void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop) 
 {
   auto it = sources.find(name);
 
@@ -1189,13 +1190,14 @@ void ObsInterface::getSourcePos(std::string name, vec2* pos, vec2* size, vec2* s
 
   obs_sceneitem_get_pos(item, pos);
   obs_sceneitem_get_scale(item, scale);
+  obs_sceneitem_get_crop(item, crop);
 
   // Pre-scaled sizes.
   size->x = obs_source_get_width(source);
   size->y = obs_source_get_height(source);
 }
 
-void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
+void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop) {
   obs_sceneitem_t *item = obs_scene_find_source(scene, name.c_str());
 
   if (!item) {
@@ -1205,6 +1207,7 @@ void ObsInterface::setSourcePos(std::string name, vec2* pos, vec2* scale) {
 
   obs_sceneitem_set_pos(item, pos);
   obs_sceneitem_set_scale(item, scale);
+  obs_sceneitem_set_crop(item, crop);
 }
 
 std::vector<std::string> ObsInterface::listAvailableVideoEncoders()

package/src/obs_interface.h

@@ -67,8 +67,8 @@ class ObsInterface {
 
     void addSourceToScene(std::string name); // Add source to scene.
     void removeSourceFromScene(std::string name); // Remove source from scene.
-    void getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale); // Size is returned to allow clients to calculate scale.
-    void setSourcePos(std::string name, vec2* pos, vec2* scale); // Size does not get set here because it's set by the source itself.
+    void getSourcePos(std::string name, vec2* pos, vec2* size, vec2* scale, obs_sceneitem_crop* crop); // Size is returned to allow clients to calculate scale.
+    void setSourcePos(std::string name, vec2* pos, vec2* scale, obs_sceneitem_crop* crop); // Size does not get set here because it's set by the source itself.
 
     void initPreview(HWND parent); // Must call this before showPreview to setup resources.
     void configurePreview(int x, int y, int width, int height); // Move and resize the preview display.