Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

This commit is contained in:
momo 2023-10-30 17:59:18 +08:00
commit a9ba1e1e38

View File

@ -278,7 +278,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
//否则继续去unity
}
//组装数据
if err = w.assembleRenderDataToUnity(taskId, combineImage, renderImageData, productTemplate, model3dInfo, element, productSize); err != nil {
if err = w.assembleRenderDataToUnity(taskId, resolution, combineImage, renderImageData, productTemplate, model3dInfo, element, productSize); err != nil {
logx.Error("组装数据失败:", err)
return
}
@ -333,7 +333,7 @@ func (w *wsConnectItem) getProductRelateionInfo(renderImageData *websocket_data.
}
// 组装数据发送给unity
func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage string, info websocket_data.RenderImageReqMsg, productTemplate *gmodel.FsProductTemplateV2, model3dInfo *gmodel.FsProductModel3d, element *gmodel.FsProductTemplateElement, productSize *gmodel.FsProductSize) (err error) {
func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, resolution int, combineImage string, info websocket_data.RenderImageReqMsg, productTemplate *gmodel.FsProductTemplateV2, model3dInfo *gmodel.FsProductModel3d, element *gmodel.FsProductTemplateElement, productSize *gmodel.FsProductSize) (err error) {
//组装数据
refletion := -1
if element.Refletion != nil && *element.Refletion != "" {
@ -426,6 +426,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st
"source": "home page",
"priority": 1,
"create_at": time.Now().UTC(),
"resolution": resolution,
"render_data": sendData,
}
postDataBytes, _ := json.Marshal(postData)