Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine
Manage
Activity
Members
Labels
Plan
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sip
engine
Commits
38470966
Commit
38470966
authored
4 months ago
by
D-AIRY
Browse files
Options
Downloads
Patches
Plain Diff
Prevent spawning proxy object when target is not found
parent
4238a723
Branches
Branches containing commit
No related tags found
1 merge request
!24
Ladder
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/terrax/terrax.cpp
+21
-16
21 additions, 16 deletions
source/terrax/terrax.cpp
with
21 additions
and
16 deletions
source/terrax/terrax.cpp
+
21
−
16
View file @
38470966
...
...
@@ -1278,28 +1278,33 @@ int main(int argc, char **argv)
}
CProxyObject
*
pProxy
=
new
CProxyObject
(
guid
);
pProxy
->
setDstObject
(
guidTarget
);
for
(
UINT
k
=
0
,
kl
=
pSArr
->
size
();
k
<
kl
;
++
k
)
if
(
pProxy
->
setDstObject
(
guidTarget
))
{
szGUID
=
pSArr
->
at
(
k
)
->
getString
();
if
(
!
szGUID
||
!
XGUIDFromString
(
&
guid
,
szGUID
))
for
(
UINT
k
=
0
,
kl
=
pSArr
->
size
();
k
<
kl
;
++
k
)
{
LibReport
(
REPORT_MSG_LEVEL_ERROR
,
"Invalid model '%u' guid in proxy '%u' in '%s'. '%s'
\n
"
,
k
,
j
,
szFile
,
szGUID
?
szGUID
:
""
);
continue
;
szGUID
=
pSArr
->
at
(
k
)
->
getString
();
if
(
!
szGUID
||
!
XGUIDFromString
(
&
guid
,
szGUID
))
{
LibReport
(
REPORT_MSG_LEVEL_ERROR
,
"Invalid model '%u' guid in proxy '%u' in '%s'. '%s'
\n
"
,
k
,
j
,
szFile
,
szGUID
?
szGUID
:
""
);
continue
;
}
pProxy
->
addSrcModel
(
guid
);
}
pProxy
->
addSrcModel
(
guid
);
}
g_apProxies
.
push_back
(
pProxy
);
g_apProxies
.
push_back
(
pProxy
);
//pProxy->build();
//pProxy->build();
add_ref
(
pProxy
);
g_pLevelObjects
.
push_back
(
pProxy
);
add_ref
(
pProxy
);
g_pLevelObjects
.
push_back
(
pProxy
);
isLoaded
=
true
;
isLoaded
=
true
;
}
else
{
mem_release
(
pProxy
);
}
}
}
}
...
...
@@ -1849,7 +1854,7 @@ void XRender3D()
pvData
=
NULL
;
XEnumerateObjects
([
&
](
IXEditorObject
*
pObj
,
bool
isProxy
,
ICompoundObject
*
pParent
){
float3_t
vPos
=
pObj
->
getPos
();
//
float3_t vPos = pObj->getPos();
TODO
(
"Add visibility check"
);
/*if(fViewportBorders.x > vPos.x || fViewportBorders.z < vPos.x || fViewportBorders.y < vPos.z) // not visible
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment