fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eson 2023-09-06 17:10:44 +08:00
commit 6c7933794d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/websocket/internal/logic/ws_render_image.go
View File

@ -178,10 +178,10 @@ func (w *wsConnectItem) renderImage(data []byte) {
return return
} }
//发送合图完毕阶段消息 //发送合图完毕阶段消息
w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, productSize.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile) w.sendCombineImageStepResponseMessage(renderImageData.RenderId, combineImage, productSize.Id, model3dInfo.Id, productTemplate.Id, res.DiffTimeLogoCombine, res.DiffTimeUploadFile)
//如果指定指定只返回刀版图 //如果指定指定只返回刀版图
if renderImageData.OnlyReturnCombineImage { if renderImageData.OnlyReturnCombineImage {
logx.Info("云渲染传入size id则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId) logx.Info("云渲染传入only_return_combine_image = true则不走unity云渲染,只返回刀版图，render_id:", renderImageData.RenderId)
return return
} }
//获取唯一id //获取唯一id
@ -382,7 +382,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st
} }
// 发送合图完毕阶段通知消息 // 发送合图完毕阶段通知消息
func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, sizeId, combineTime, uploadTime int64) { func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineImage string, sizeId, modelId, templateId, combineTime, uploadTime int64) {
combineTakesTime := "cache" combineTakesTime := "cache"
uploadCombineImageTakesTime := "cache" uploadCombineImageTakesTime := "cache"
if combineTime > 0 { if combineTime > 0 {
@ -395,6 +395,8 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, combineIma
RenderId: renderId, RenderId: renderId,
CombineImage: combineImage, CombineImage: combineImage,
SizeId: sizeId, SizeId: sizeId,
ModelId: modelId,
TemplateId: templateId,
CombineProcessTime: websocket_data.CombineProcessTime{ CombineProcessTime: websocket_data.CombineProcessTime{
CombineTakesTime: combineTakesTime, CombineTakesTime: combineTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime, UploadCombineImageTakesTime: uploadCombineImageTakesTime,

2
utils/websocket_data/render_data.go
View File

@ -44,6 +44,8 @@ type CombineImageRspMsg struct {
RenderId string `json:"render_id"` //渲染id RenderId string `json:"render_id"` //渲染id
CombineImage string `json:"combine_image"` //刀版图 CombineImage string `json:"combine_image"` //刀版图
SizeId int64 `json:"size_id"` //尺寸id SizeId int64 `json:"size_id"` //尺寸id
ModelId int64 `json:"model_id"`
TemplateId int64 `json:"template_id"`
CombineProcessTime CombineProcessTime `json:"combine_process_time"` CombineProcessTime CombineProcessTime `json:"combine_process_time"`
} }
type CombineProcessTime struct { type CombineProcessTime struct {