Skip to content

Commit e460c12

Browse files
committed
Corrected the C-interface to SimVis by adding missing Ref{..} and changing Ptr{..} to Ref{..}.
1 parent 55866e2 commit e460c12

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/renderer/DLR_Visualization/wrapper/simvis_bothEditions.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function SimVis_setBaseObject(ID::Ptr{Void},
3636
canCollide::Cint,
3737
shadowMask::Cint)
3838
ccall(simVisFunctions.setBaseObject, Void,
39-
(Ptr{Void},Cint,Cint,Ref{Cdouble},Ref{Cdouble},Ref{Cdouble},Ref{Cint},Cint,Cint,Cdouble,Ref{Cdouble},Cdouble,Cint,Cint),
39+
(Ptr{Void},Cint,Cint,Ref{SVector{3,Float64}},Ref{SMatrix{3,3,Float64,9}},Ref{MVector{3,Float64}},Ref{MVector{3,Cint}},Cint,Cint,Cdouble,Ref{MVector{3,Float64}},Cdouble,Cint,Cint),
4040
ID,state,baseObjType,pos,T,scale,color,wireframe,reflectslight,specularCoefficient,extra,alpha,canCollide,shadowMask)
4141
end
4242

@@ -55,7 +55,7 @@ function SimVis_setBaseObject(ID::Ptr{Void},
5555
canCollide::Cint,
5656
shadowMask::Cint)
5757
ccall(simVisFunctions.setBaseObject, Void,
58-
(Ptr{Void},Cint,Cint,SVector{3,Float64},SMatrix{3,3,Float64,9},Ptr{Cdouble},Ptr{Cint},Cint,Cint,Cdouble,Ptr{Cdouble},Cdouble,Cint,Cint),
58+
(Ptr{Void},Cint,Cint,Ref{SVector{3,Float64}},Ref{SMatrix{3,3,Float64,9}},Ref{MVector{3,Float64}},Ref{MVector{3,Cint}},Cint,Cint,Cdouble,Ref{MVector{3,Float64}},Cdouble,Cint,Cint),
5959
ID,state,baseObjType,pos,T,scale,color,wireframe,reflectslight,specularCoefficient,extra,alpha,canCollide,shadowMask)
6060
end
6161

@@ -77,7 +77,7 @@ function SimVis_setFileObject(ID::Ptr{Void},
7777
shadowMask::Cint,
7878
shaderName::String)
7979
ccall(simVisFunctions.setFileObject, Void,
80-
(Ptr{Void},Cint,Ref{Cdouble},Ref{Cdouble},Ref{Cdouble},Cint,Cdouble,Cdouble,Cint,Cint,Cstring,Cint,Cint,Ref{Cint},Cint,Cstring),
80+
(Ptr{Void},Cint,Ref{MVector{3,Float64}},Ref{MVector{3,Float64}},Ref{MVector{3,Float64}},Cint,Cdouble,Cdouble,Cint,Cint,Cstring,Cint,Cint,Ref{MVector{3,Cint}},Cint,Cstring),
8181
ID,state,pos,T,scale,reflectslight,specularCoefficient,alpha,wireframe,canCollide,filename,smooth,overwriteColor,color,shadowMask,shaderName)
8282
end
8383

@@ -100,6 +100,6 @@ function SimVis_setFileObject(ID::Ptr{Void},
100100
shadowMask::Cint,
101101
shaderName::String)
102102
ccall(simVisFunctions.setFileObject, Void,
103-
(Ptr{Void},Cint,SVector{3,Cdouble},SMatrix{3,3,Cdouble,9},Ref{Cdouble},Cint,Cdouble,Cdouble,Cint,Cint,Cstring,Cint,Cint,Ref{Cint},Cint,Cstring),
103+
(Ptr{Void},Cint,Ref{SVector{3,Cdouble}},Ref{SMatrix{3,3,Cdouble,9}},Ref{MVector{3,Float64}},Cint,Cdouble,Cdouble,Cint,Cint,Cstring,Cint,Cint,Ref{MVector{3,Cint}},Cint,Cstring),
104104
ID,state,pos,T, scale,reflectslight,specularCoefficient,alpha,wireframe,canCollide,filename,smooth,overwriteColor,color,shadowMask,shaderName)
105105
end

src/renderer/DLR_Visualization/wrapper/simvis_commercialEdition.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ function SimVis_setTextObject(ID::Ptr{Void},
5757
alignment::Cint,
5858
digits::Cint)
5959
ccall(simVisFunctions.setTextObject, Void,
60-
(Ptr{Void},Cint,Cstring,Cdouble,Cint,MVector{3,Float64},MMatrix{3,3,Float64,9},Cdouble,
61-
Cstring,Ptr{Cint},Cdouble,Ptr{Cdouble},Cint,Cint),
60+
(Ptr{Void},Cint,Cstring,Cdouble,Cint,Ref{MVector{3,Float64}},Ref{MMatrix{3,3,Float64,9}},Cdouble,
61+
Cstring,Ref{MVector{3,Cint}},Cdouble,Ref{MVector{3,Float64}},Cint,Cint),
6262
ID, screenAlignment, text, textvalue, valueactive, pos, T, charsize,
6363
fontname, color, alpha, offset, alignment, digits)
6464
end
@@ -79,8 +79,8 @@ function SimVis_setTextObject(ID::Ptr{Void},
7979
alignment::Cint,
8080
digits::Cint)
8181
ccall(simVisFunctions.setTextObject, Void,
82-
(Ptr{Void},Cint,Cstring,Cdouble,Cint,SVector{3,Cdouble},SMatrix{3,3,Cdouble,9},Cdouble,
83-
Cstring,Ptr{Cint},Cdouble,Ptr{Cdouble},Cint,Cint),
82+
(Ptr{Void},Cint,Cstring,Cdouble,Cint,Ref{SVector{3,Cdouble}},Ref{SMatrix{3,3,Cdouble,9}},Cdouble,
83+
Cstring,Ref{MVector{3,Cint}},Cdouble,Ref{MVector{3,Float64}},Cint,Cint),
8484
ID, screenAlignment, text, textvalue, valueactive, pos, T, charsize,
8585
fontname, color, alpha, offset, alignment, digits)
8686
end

0 commit comments

Comments
 (0)