FS#25 - Change sf::PostFx to a more general purpose pixel shader class (sf::Shader)
Updated the PostFx sample, renamed to Shader Renamed all the static X::CanUseX() functions to X::IsAvailable() to make the API more consistent Moved .def files from /build/VC200X to /src in CSFML Minors fixes in CSFML git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1258 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom
parent
63e07cec84
commit
d7bd00afc0
125 changed files with 1606 additions and 2348 deletions
|
|
@ -69,7 +69,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-audio-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Audio/csfml-audio-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-audio.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Audio/csfml-audio.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -193,11 +193,11 @@
|
|||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath=".\csfml-audio-d.def"
|
||||
RelativePath="..\..\src\SFML\Audio\csfml-audio-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-audio.def"
|
||||
RelativePath="..\..\src\SFML\Audio\csfml-audio.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -1,238 +0,0 @@
|
|||
LIBRARY csfml-graphics-d
|
||||
EXPORTS
|
||||
sfBlack
|
||||
sfWhite
|
||||
sfRed
|
||||
sfGreen
|
||||
sfBlue
|
||||
sfYellow
|
||||
sfMagenta
|
||||
sfCyan
|
||||
sfColor_FromRGB
|
||||
sfColor_FromRGBA
|
||||
sfColor_Add
|
||||
sfColor_Modulate
|
||||
sfImage_Create
|
||||
sfImage_CreateFromColor
|
||||
sfImage_CreateFromPixels
|
||||
sfImage_CreateFromFile
|
||||
sfImage_CreateFromMemory
|
||||
sfImage_Destroy
|
||||
sfImage_SaveToFile
|
||||
sfImage_CreateMaskFromColor
|
||||
sfImage_Copy
|
||||
sfImage_CopyScreen
|
||||
sfImage_SetPixel
|
||||
sfImage_GetPixel
|
||||
sfImage_GetPixelsPtr
|
||||
sfImage_Bind
|
||||
sfImage_SetSmooth
|
||||
sfImage_GetWidth
|
||||
sfImage_GetHeight
|
||||
sfImage_IsSmooth
|
||||
sfFloatRect_Offset
|
||||
sfFloatRect_Contains
|
||||
sfFloatRect_Intersects
|
||||
sfIntRect_Offset
|
||||
sfIntRect_Contains
|
||||
sfIntRect_Intersects
|
||||
sfPostFX_CreateFromFile
|
||||
sfPostFX_CreateFromMemory
|
||||
sfPostFX_Destroy
|
||||
sfPostFX_SetParameter1
|
||||
sfPostFX_SetParameter2
|
||||
sfPostFX_SetParameter3
|
||||
sfPostFX_SetParameter4
|
||||
sfPostFX_SetTexture
|
||||
sfPostFX_CanUsePostFX
|
||||
sfShape_Create
|
||||
sfShape_CreateLine
|
||||
sfShape_CreateRectangle
|
||||
sfShape_CreateCircle
|
||||
sfShape_Destroy
|
||||
sfShape_SetX
|
||||
sfShape_SetY
|
||||
sfShape_SetPosition
|
||||
sfShape_SetScaleX
|
||||
sfShape_SetScaleY
|
||||
sfShape_SetScale
|
||||
sfShape_SetRotation
|
||||
sfShape_SetOrigin
|
||||
sfShape_SetColor
|
||||
sfShape_SetBlendMode
|
||||
sfShape_GetX
|
||||
sfShape_GetY
|
||||
sfShape_GetScaleX
|
||||
sfShape_GetScaleY
|
||||
sfShape_GetRotation
|
||||
sfShape_GetOriginX
|
||||
sfShape_GetOriginY
|
||||
sfShape_GetColor
|
||||
sfShape_GetBlendMode
|
||||
sfShape_Move
|
||||
sfShape_Scale
|
||||
sfShape_Rotate
|
||||
sfShape_TransformToLocal
|
||||
sfShape_TransformToGlobal
|
||||
sfShape_AddPoint
|
||||
sfShape_EnableFill
|
||||
sfShape_EnableOutline
|
||||
sfShape_SetOutlineWidth
|
||||
sfShape_GetOutlineWidth
|
||||
sfShape_GetNbPoints
|
||||
sfShape_GetPointPosition
|
||||
sfShape_GetPointColor
|
||||
sfShape_GetPointOutlineColor
|
||||
sfShape_SetPointPosition
|
||||
sfShape_SetPointColor
|
||||
sfShape_SetPointOutlineColor
|
||||
sfSprite_Create
|
||||
sfSprite_Destroy
|
||||
sfSprite_SetX
|
||||
sfSprite_SetY
|
||||
sfSprite_SetPosition
|
||||
sfSprite_SetScaleX
|
||||
sfSprite_SetScaleY
|
||||
sfSprite_SetScale
|
||||
sfSprite_SetRotation
|
||||
sfSprite_SetOrigin
|
||||
sfSprite_SetColor
|
||||
sfSprite_SetBlendMode
|
||||
sfSprite_GetX
|
||||
sfSprite_GetY
|
||||
sfSprite_GetScaleX
|
||||
sfSprite_GetScaleY
|
||||
sfSprite_GetRotation
|
||||
sfSprite_GetOriginX
|
||||
sfSprite_GetOriginY
|
||||
sfSprite_GetColor
|
||||
sfSprite_GetBlendMode
|
||||
sfSprite_Move
|
||||
sfSprite_Scale
|
||||
sfSprite_Rotate
|
||||
sfSprite_TransformToLocal
|
||||
sfSprite_TransformToGlobal
|
||||
sfSprite_SetImage
|
||||
sfSprite_SetSubRect
|
||||
sfSprite_Resize
|
||||
sfSprite_FlipX
|
||||
sfSprite_FlipY
|
||||
sfSprite_GetImage
|
||||
sfSprite_GetSubRect
|
||||
sfSprite_GetWidth
|
||||
sfSprite_GetHeight
|
||||
sfSprite_GetPixel
|
||||
sfFont_Create
|
||||
sfFont_CreateFromFile
|
||||
sfFont_CreateFromMemory
|
||||
sfFont_Destroy
|
||||
sfFont_GetCharacterSize
|
||||
sfFont_GetDefaultFont
|
||||
sfString_Create
|
||||
sfString_Destroy
|
||||
sfString_SetX
|
||||
sfString_SetY
|
||||
sfString_SetPosition
|
||||
sfString_SetScaleX
|
||||
sfString_SetScaleY
|
||||
sfString_SetScale
|
||||
sfString_SetRotation
|
||||
sfString_SetOrigin
|
||||
sfString_SetColor
|
||||
sfString_SetBlendMode
|
||||
sfString_GetX
|
||||
sfString_GetY
|
||||
sfString_GetScaleX
|
||||
sfString_GetScaleY
|
||||
sfString_GetRotation
|
||||
sfString_GetOriginX
|
||||
sfString_GetOriginY
|
||||
sfString_GetColor
|
||||
sfString_GetBlendMode
|
||||
sfString_Move
|
||||
sfString_Scale
|
||||
sfString_Rotate
|
||||
sfString_TransformToLocal
|
||||
sfString_TransformToGlobal
|
||||
sfString_SetText
|
||||
sfString_SetUnicodeText
|
||||
sfString_SetFont
|
||||
sfString_SetSize
|
||||
sfString_SetStyle
|
||||
sfString_GetUnicodeText
|
||||
sfString_GetText
|
||||
sfString_GetFont
|
||||
sfString_GetSize
|
||||
sfString_GetStyle
|
||||
sfString_GetCharacterPos
|
||||
sfString_GetRect
|
||||
sfRenderImage_Create
|
||||
sfRenderImage_Destroy
|
||||
sfRenderImage_GetWidth
|
||||
sfRenderImage_GetHeight
|
||||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawPostFX
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
sfRenderImage_DrawString
|
||||
sfRenderImage_Clear
|
||||
sfRenderImage_SetView
|
||||
sfRenderImage_GetView
|
||||
sfRenderImage_GetDefaultView
|
||||
sfRenderImage_PreserveOpenGLStates
|
||||
sfRenderImage_GetImage
|
||||
sfRenderImage_CanUseRenderImage
|
||||
sfRenderWindow_Create
|
||||
sfRenderWindow_CreateFromHandle
|
||||
sfRenderWindow_Destroy
|
||||
sfRenderWindow_Close
|
||||
sfRenderWindow_IsOpened
|
||||
sfRenderWindow_GetWidth
|
||||
sfRenderWindow_GetHeight
|
||||
sfRenderWindow_GetSettings
|
||||
sfRenderWindow_GetEvent
|
||||
sfRenderWindow_WaitEvent
|
||||
sfRenderWindow_UseVerticalSync
|
||||
sfRenderWindow_ShowMouseCursor
|
||||
sfRenderWindow_SetCursorPosition
|
||||
sfRenderWindow_SetPosition
|
||||
sfRenderWindow_SetSize
|
||||
sfRenderWindow_Show
|
||||
sfRenderWindow_EnableKeyRepeat
|
||||
sfRenderWindow_SetIcon
|
||||
sfRenderWindow_SetActive
|
||||
sfRenderWindow_Flush
|
||||
sfRenderWindow_Display
|
||||
sfRenderWindow_GetInput
|
||||
sfRenderWindow_SetFramerateLimit
|
||||
sfRenderWindow_GetFrameTime
|
||||
sfRenderWindow_SetJoystickThreshold
|
||||
sfRenderWindow_DrawPostFX
|
||||
sfRenderWindow_DrawSprite
|
||||
sfRenderWindow_DrawString
|
||||
sfRenderWindow_DrawShape
|
||||
sfRenderWindow_Clear
|
||||
sfRenderWindow_SetView
|
||||
sfRenderWindow_GetView
|
||||
sfRenderWindow_GetDefaultView
|
||||
sfRenderWindow_ConvertCoords
|
||||
sfRenderWindow_PreserveOpenGLStates
|
||||
sfView_Create
|
||||
sfView_CreateFromRect
|
||||
sfView_Destroy
|
||||
sfView_SetCenter
|
||||
sfView_SetSize
|
||||
sfView_SetRotation
|
||||
sfView_SetViewport
|
||||
sfView_Reset
|
||||
sfView_GetCenterX
|
||||
sfView_GetCenterY
|
||||
sfView_GetWidth
|
||||
sfView_GetHeight
|
||||
sfView_GetRotation
|
||||
sfView_GetViewport
|
||||
sfView_Move
|
||||
sfView_Rotate
|
||||
sfView_Zoom
|
||||
|
|
@ -1,239 +0,0 @@
|
|||
LIBRARY csfml-graphics
|
||||
EXPORTS
|
||||
sfBlack
|
||||
sfWhite
|
||||
sfRed
|
||||
sfGreen
|
||||
sfBlue
|
||||
sfYellow
|
||||
sfMagenta
|
||||
sfCyan
|
||||
sfColor_FromRGB
|
||||
sfColor_FromRGBA
|
||||
sfColor_Add
|
||||
sfColor_Modulate
|
||||
sfImage_Create
|
||||
sfImage_CreateFromColor
|
||||
sfImage_CreateFromPixels
|
||||
sfImage_CreateFromFile
|
||||
sfImage_CreateFromMemory
|
||||
sfImage_Destroy
|
||||
sfImage_SaveToFile
|
||||
sfImage_CreateMaskFromColor
|
||||
sfImage_Copy
|
||||
sfImage_CopyScreen
|
||||
sfImage_SetPixel
|
||||
sfImage_GetPixel
|
||||
sfImage_GetPixelsPtr
|
||||
sfImage_Bind
|
||||
sfImage_SetSmooth
|
||||
sfImage_GetWidth
|
||||
sfImage_GetHeight
|
||||
sfImage_IsSmooth
|
||||
sfFloatRect_Offset
|
||||
sfFloatRect_Contains
|
||||
sfFloatRect_Intersects
|
||||
sfIntRect_Offset
|
||||
sfIntRect_Contains
|
||||
sfIntRect_Intersects
|
||||
sfPostFX_CreateFromFile
|
||||
sfPostFX_CreateFromMemory
|
||||
sfPostFX_Destroy
|
||||
sfPostFX_SetParameter1
|
||||
sfPostFX_SetParameter2
|
||||
sfPostFX_SetParameter3
|
||||
sfPostFX_SetParameter4
|
||||
sfPostFX_SetTexture
|
||||
sfPostFX_CanUsePostFX
|
||||
sfShape_Create
|
||||
sfShape_CreateLine
|
||||
sfShape_CreateRectangle
|
||||
sfShape_CreateCircle
|
||||
sfShape_Destroy
|
||||
sfShape_SetX
|
||||
sfShape_SetY
|
||||
sfShape_SetPosition
|
||||
sfShape_SetScaleX
|
||||
sfShape_SetScaleY
|
||||
sfShape_SetScale
|
||||
sfShape_SetRotation
|
||||
sfShape_SetOrigin
|
||||
sfShape_SetColor
|
||||
sfShape_SetBlendMode
|
||||
sfShape_GetX
|
||||
sfShape_GetY
|
||||
sfShape_GetScaleX
|
||||
sfShape_GetScaleY
|
||||
sfShape_GetRotation
|
||||
sfShape_GetOriginX
|
||||
sfShape_GetOriginY
|
||||
sfShape_GetColor
|
||||
sfShape_GetBlendMode
|
||||
sfShape_Move
|
||||
sfShape_Scale
|
||||
sfShape_Rotate
|
||||
sfShape_TransformToLocal
|
||||
sfShape_TransformToGlobal
|
||||
sfShape_AddPoint
|
||||
sfShape_EnableFill
|
||||
sfShape_EnableOutline
|
||||
sfShape_SetOutlineWidth
|
||||
sfShape_GetOutlineWidth
|
||||
sfShape_GetNbPoints
|
||||
sfShape_GetPointPosition
|
||||
sfShape_GetPointColor
|
||||
sfShape_GetPointOutlineColor
|
||||
sfShape_SetPointPosition
|
||||
sfShape_SetPointColor
|
||||
sfShape_SetPointOutlineColor
|
||||
sfSprite_Create
|
||||
sfSprite_Destroy
|
||||
sfSprite_SetX
|
||||
sfSprite_SetY
|
||||
sfSprite_SetPosition
|
||||
sfSprite_SetScaleX
|
||||
sfSprite_SetScaleY
|
||||
sfSprite_SetScale
|
||||
sfSprite_SetRotation
|
||||
sfSprite_SetOrigin
|
||||
sfSprite_SetColor
|
||||
sfSprite_SetBlendMode
|
||||
sfSprite_GetX
|
||||
sfSprite_GetY
|
||||
sfSprite_GetScaleX
|
||||
sfSprite_GetScaleY
|
||||
sfSprite_GetRotation
|
||||
sfSprite_GetOriginX
|
||||
sfSprite_GetOriginY
|
||||
sfSprite_GetColor
|
||||
sfSprite_GetBlendMode
|
||||
sfSprite_Move
|
||||
sfSprite_Scale
|
||||
sfSprite_Rotate
|
||||
sfSprite_TransformToLocal
|
||||
sfSprite_TransformToGlobal
|
||||
sfSprite_SetImage
|
||||
sfSprite_SetSubRect
|
||||
sfSprite_Resize
|
||||
sfSprite_FlipX
|
||||
sfSprite_FlipY
|
||||
sfSprite_GetImage
|
||||
sfSprite_GetSubRect
|
||||
sfSprite_GetWidth
|
||||
sfSprite_GetHeight
|
||||
sfSprite_GetPixel
|
||||
sfFont_Create
|
||||
sfFont_CreateFromFile
|
||||
sfFont_CreateFromMemory
|
||||
sfFont_Destroy
|
||||
sfFont_GetCharacterSize
|
||||
sfFont_GetDefaultFont
|
||||
sfString_Create
|
||||
sfString_Destroy
|
||||
sfString_SetX
|
||||
sfString_SetY
|
||||
sfString_SetPosition
|
||||
sfString_SetScaleX
|
||||
sfString_SetScaleY
|
||||
sfString_SetScale
|
||||
sfString_SetRotation
|
||||
sfString_SetOrigin
|
||||
sfString_SetColor
|
||||
sfString_SetBlendMode
|
||||
sfString_GetX
|
||||
sfString_GetY
|
||||
sfString_GetScaleX
|
||||
sfString_GetScaleY
|
||||
sfString_GetRotation
|
||||
sfString_GetOriginX
|
||||
sfString_GetOriginY
|
||||
sfString_GetColor
|
||||
sfString_GetBlendMode
|
||||
sfString_Move
|
||||
sfString_Scale
|
||||
sfString_Rotate
|
||||
sfString_TransformToLocal
|
||||
sfString_TransformToGlobal
|
||||
sfString_SetText
|
||||
sfString_SetUnicodeText
|
||||
sfString_SetFont
|
||||
sfString_SetSize
|
||||
sfString_SetStyle
|
||||
sfString_GetUnicodeText
|
||||
sfString_GetText
|
||||
sfString_GetFont
|
||||
sfString_GetSize
|
||||
sfString_GetStyle
|
||||
sfString_GetCharacterPos
|
||||
sfString_GetRect
|
||||
sfRenderImage_Create
|
||||
sfRenderImage_Destroy
|
||||
sfRenderImage_GetWidth
|
||||
sfRenderImage_GetHeight
|
||||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawPostFX
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
sfRenderImage_DrawString
|
||||
sfRenderImage_Clear
|
||||
sfRenderImage_SetView
|
||||
sfRenderImage_GetView
|
||||
sfRenderImage_GetDefaultView
|
||||
sfRenderImage_GetViewport
|
||||
sfRenderImage_ConvertCoords
|
||||
sfRenderImage_GetImage
|
||||
sfRenderImage_CanUseRenderImage
|
||||
sfRenderWindow_Create
|
||||
sfRenderWindow_CreateFromHandle
|
||||
sfRenderWindow_Destroy
|
||||
sfRenderWindow_Close
|
||||
sfRenderWindow_IsOpened
|
||||
sfRenderWindow_GetWidth
|
||||
sfRenderWindow_GetHeight
|
||||
sfRenderWindow_GetSettings
|
||||
sfRenderWindow_GetEvent
|
||||
sfRenderWindow_WaitEvent
|
||||
sfRenderWindow_UseVerticalSync
|
||||
sfRenderWindow_ShowMouseCursor
|
||||
sfRenderWindow_SetCursorPosition
|
||||
sfRenderWindow_SetPosition
|
||||
sfRenderWindow_SetSize
|
||||
sfRenderWindow_Show
|
||||
sfRenderWindow_EnableKeyRepeat
|
||||
sfRenderWindow_SetIcon
|
||||
sfRenderWindow_SetActive
|
||||
sfRenderWindow_Flush
|
||||
sfRenderWindow_Display
|
||||
sfRenderWindow_GetInput
|
||||
sfRenderWindow_SetFramerateLimit
|
||||
sfRenderWindow_GetFrameTime
|
||||
sfRenderWindow_SetJoystickThreshold
|
||||
sfRenderWindow_DrawPostFX
|
||||
sfRenderWindow_DrawSprite
|
||||
sfRenderWindow_DrawString
|
||||
sfRenderWindow_DrawShape
|
||||
sfRenderWindow_Clear
|
||||
sfRenderWindow_SetView
|
||||
sfRenderWindow_GetView
|
||||
sfRenderWindow_GetDefaultView
|
||||
sfRenderWindow_GetViewport
|
||||
sfRenderWindow_ConvertCoords
|
||||
sfView_Create
|
||||
sfView_CreateFromRect
|
||||
sfView_Destroy
|
||||
sfView_SetCenter
|
||||
sfView_SetSize
|
||||
sfView_SetRotation
|
||||
sfView_SetViewport
|
||||
sfView_Reset
|
||||
sfView_GetCenterX
|
||||
sfView_GetCenterY
|
||||
sfView_GetWidth
|
||||
sfView_GetHeight
|
||||
sfView_GetRotation
|
||||
sfView_GetViewport
|
||||
sfView_Move
|
||||
sfView_Rotate
|
||||
sfView_Zoom
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-graphics-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-graphics.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -214,11 +214,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-graphics-d.def"
|
||||
RelativePath="..\..\src\SFML\Graphics\csfml-graphics-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-graphics.def"
|
||||
RelativePath="..\..\src\SFML\Graphics\csfml-graphics.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -249,18 +249,6 @@
|
|||
RelativePath="..\..\src\SFML\Graphics\ImageStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\PostFX.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFXStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Rect.cpp"
|
||||
>
|
||||
|
|
@ -293,6 +281,18 @@
|
|||
RelativePath="..\..\src\SFML\Graphics\RenderWindowStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\Shader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\ShaderStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-network-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Network/csfml-network-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-network.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Network/csfml-network.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -191,11 +191,11 @@
|
|||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath=".\csfml-network-d.def"
|
||||
RelativePath="..\..\src\SFML\Network\csfml-network-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-network.def"
|
||||
RelativePath="..\..\src\SFML\Network\csfml-network.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-system-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/System/csfml-system-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-system.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/System/csfml-system.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -203,11 +203,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-system-d.def"
|
||||
RelativePath="..\..\src\SFML\System\csfml-system-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-system.def"
|
||||
RelativePath="..\..\src\SFML\System\csfml-system.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-window-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Window/csfml-window-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-window.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Window/csfml-window.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -205,11 +205,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-window-d.def"
|
||||
RelativePath="..\..\src\SFML\Window\csfml-window-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-window.def"
|
||||
RelativePath="..\..\src\SFML\Window\csfml-window.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -1,18 +1,25 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual C++ Express 2008
|
||||
# Visual Studio 2008
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-audio", "csfml-audio.vcproj", "{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-graphics", "csfml-graphics.vcproj", "{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-network", "csfml-network.vcproj", "{823DDC98-42D5-4A38-88CF-9DC06C788AE4}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-system", "csfml-system.vcproj", "{C061A27D-7CA0-4179-9869-672FA04A86A8}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-window", "csfml-window.vcproj", "{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-main", "csfml-main.vcproj", "{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csfml-network", "csfml-network.vcproj", "{823DDC98-42D5-4A38-88CF-9DC06C788AE4}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\..\test\test\test.vcproj", "{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug DLL|Win32 = Debug DLL|Win32
|
||||
|
|
@ -37,14 +44,6 @@ Global
|
|||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}.Release DLL|Win32.Build.0 = Release DLL|Win32
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}.Release|Win32.ActiveCfg = Release DLL|Win32
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}.Release|Win32.Build.0 = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.ActiveCfg = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release DLL|Win32.Build.0 = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.Build.0 = Release DLL|Win32
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8}.Debug|Win32.ActiveCfg = Debug DLL|Win32
|
||||
|
|
@ -69,6 +68,22 @@ Global
|
|||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}.Release|Win32.Build.0 = Release|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.ActiveCfg = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release DLL|Win32.Build.0 = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release DLL|Win32
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.Build.0 = Release DLL|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Release DLL|Win32.ActiveCfg = Release|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7A02953B-8770-4276-8BC3-ECFFCFAECEE7}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
LIBRARY csfml-audio-d
|
||||
EXPORTS
|
||||
sfListener_SetGlobalVolume
|
||||
sfListener_GetGlobalVolume
|
||||
sfListener_SetPosition
|
||||
sfListener_GetPosition
|
||||
sfListener_SetDirection
|
||||
sfListener_GetDirection
|
||||
sfMusic_CreateFromFile
|
||||
sfMusic_CreateFromMemory
|
||||
sfMusic_Destroy
|
||||
sfMusic_SetLoop
|
||||
sfMusic_GetLoop
|
||||
sfMusic_GetDuration
|
||||
sfMusic_Play
|
||||
sfMusic_Pause
|
||||
sfMusic_Stop
|
||||
sfMusic_GetChannelsCount
|
||||
sfMusic_GetSampleRate
|
||||
sfMusic_GetStatus
|
||||
sfMusic_SetPitch
|
||||
sfMusic_SetVolume
|
||||
sfMusic_SetPosition
|
||||
sfMusic_SetRelativeToListener
|
||||
sfMusic_SetMinDistance
|
||||
sfMusic_SetAttenuation
|
||||
sfMusic_SetPlayingOffset
|
||||
sfMusic_GetPitch
|
||||
sfMusic_GetVolume
|
||||
sfMusic_GetPosition
|
||||
sfMusic_IsRelativeToListener
|
||||
sfMusic_GetMinDistance
|
||||
sfMusic_GetAttenuation
|
||||
sfMusic_GetPlayingOffset
|
||||
sfSound_Create
|
||||
sfSound_Destroy
|
||||
sfSound_Play
|
||||
sfSound_Pause
|
||||
sfSound_Stop
|
||||
sfSound_SetBuffer
|
||||
sfSound_GetBuffer
|
||||
sfSound_SetLoop
|
||||
sfSound_GetLoop
|
||||
sfSound_GetStatus
|
||||
sfSound_SetPitch
|
||||
sfSound_SetVolume
|
||||
sfSound_SetPosition
|
||||
sfSound_SetRelativeToListener
|
||||
sfSound_SetMinDistance
|
||||
sfSound_SetAttenuation
|
||||
sfSound_SetPlayingOffset
|
||||
sfSound_GetPitch
|
||||
sfSound_GetVolume
|
||||
sfSound_GetPosition
|
||||
sfSound_IsRelativeToListener
|
||||
sfSound_GetPlayingOffset
|
||||
sfSound_GetMinDistance
|
||||
sfSound_GetAttenuation
|
||||
sfSoundBuffer_CreateFromFile
|
||||
sfSoundBuffer_CreateFromMemory
|
||||
sfSoundBuffer_CreateFromSamples
|
||||
sfSoundBuffer_Destroy
|
||||
sfSoundBuffer_SaveToFile
|
||||
sfSoundBuffer_GetSamples
|
||||
sfSoundBuffer_GetSamplesCount
|
||||
sfSoundBuffer_GetSampleRate
|
||||
sfSoundBuffer_GetChannelsCount
|
||||
sfSoundBuffer_GetDuration
|
||||
sfSoundBufferRecorder_Create
|
||||
sfSoundBufferRecorder_Destroy
|
||||
sfSoundBufferRecorder_Start
|
||||
sfSoundBufferRecorder_Stop
|
||||
sfSoundBufferRecorder_GetSampleRate
|
||||
sfSoundBufferRecorder_GetBuffer
|
||||
sfSoundRecorder_Create
|
||||
sfSoundRecorder_Destroy
|
||||
sfSoundRecorder_Start
|
||||
sfSoundRecorder_Stop
|
||||
sfSoundRecorder_GetSampleRate
|
||||
sfSoundRecorder_CanCapture
|
||||
sfSoundStream_Create
|
||||
sfSoundStream_Destroy
|
||||
sfSoundStream_Play
|
||||
sfSoundStream_Pause
|
||||
sfSoundStream_Stop
|
||||
sfSoundStream_GetStatus
|
||||
sfSoundStream_GetChannelsCount
|
||||
sfSoundStream_GetSampleRate
|
||||
sfSoundStream_SetPitch
|
||||
sfSoundStream_SetVolume
|
||||
sfSoundStream_SetPosition
|
||||
sfSoundStream_SetRelativeToListener
|
||||
sfSoundStream_SetMinDistance
|
||||
sfSoundStream_SetAttenuation
|
||||
sfSoundStream_SetPlayingOffset
|
||||
sfSoundStream_SetLoop
|
||||
sfSoundStream_GetPitch
|
||||
sfSoundStream_GetVolume
|
||||
sfSoundStream_GetPosition
|
||||
sfSoundStream_IsRelativeToListener
|
||||
sfSoundStream_GetMinDistance
|
||||
sfSoundStream_GetAttenuation
|
||||
sfSoundStream_GetLoop
|
||||
sfSoundStream_GetPlayingOffset
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
LIBRARY csfml-audio
|
||||
EXPORTS
|
||||
sfListener_SetGlobalVolume
|
||||
sfListener_GetGlobalVolume
|
||||
sfListener_SetPosition
|
||||
sfListener_GetPosition
|
||||
sfListener_SetDirection
|
||||
sfListener_GetDirection
|
||||
sfMusic_CreateFromFile
|
||||
sfMusic_CreateFromMemory
|
||||
sfMusic_Destroy
|
||||
sfMusic_SetLoop
|
||||
sfMusic_GetLoop
|
||||
sfMusic_GetDuration
|
||||
sfMusic_Play
|
||||
sfMusic_Pause
|
||||
sfMusic_Stop
|
||||
sfMusic_GetChannelsCount
|
||||
sfMusic_GetSampleRate
|
||||
sfMusic_GetStatus
|
||||
sfMusic_SetPitch
|
||||
sfMusic_SetVolume
|
||||
sfMusic_SetPosition
|
||||
sfMusic_SetRelativeToListener
|
||||
sfMusic_SetMinDistance
|
||||
sfMusic_SetAttenuation
|
||||
sfMusic_SetPlayingOffset
|
||||
sfMusic_GetPitch
|
||||
sfMusic_GetVolume
|
||||
sfMusic_GetPosition
|
||||
sfMusic_IsRelativeToListener
|
||||
sfMusic_GetMinDistance
|
||||
sfMusic_GetAttenuation
|
||||
sfMusic_GetPlayingOffset
|
||||
sfSound_Create
|
||||
sfSound_Destroy
|
||||
sfSound_Play
|
||||
sfSound_Pause
|
||||
sfSound_Stop
|
||||
sfSound_SetBuffer
|
||||
sfSound_GetBuffer
|
||||
sfSound_SetLoop
|
||||
sfSound_GetLoop
|
||||
sfSound_GetStatus
|
||||
sfSound_SetPitch
|
||||
sfSound_SetVolume
|
||||
sfSound_SetPosition
|
||||
sfSound_SetRelativeToListener
|
||||
sfSound_SetMinDistance
|
||||
sfSound_SetAttenuation
|
||||
sfSound_SetPlayingOffset
|
||||
sfSound_GetPitch
|
||||
sfSound_GetVolume
|
||||
sfSound_GetPosition
|
||||
sfSound_IsRelativeToListener
|
||||
sfSound_GetPlayingOffset
|
||||
sfSound_GetMinDistance
|
||||
sfSound_GetAttenuation
|
||||
sfSoundBuffer_CreateFromFile
|
||||
sfSoundBuffer_CreateFromMemory
|
||||
sfSoundBuffer_CreateFromSamples
|
||||
sfSoundBuffer_Destroy
|
||||
sfSoundBuffer_SaveToFile
|
||||
sfSoundBuffer_GetSamples
|
||||
sfSoundBuffer_GetSamplesCount
|
||||
sfSoundBuffer_GetSampleRate
|
||||
sfSoundBuffer_GetChannelsCount
|
||||
sfSoundBuffer_GetDuration
|
||||
sfSoundBufferRecorder_Create
|
||||
sfSoundBufferRecorder_Destroy
|
||||
sfSoundBufferRecorder_Start
|
||||
sfSoundBufferRecorder_Stop
|
||||
sfSoundBufferRecorder_GetSampleRate
|
||||
sfSoundBufferRecorder_GetBuffer
|
||||
sfSoundRecorder_Create
|
||||
sfSoundRecorder_Destroy
|
||||
sfSoundRecorder_Start
|
||||
sfSoundRecorder_Stop
|
||||
sfSoundRecorder_GetSampleRate
|
||||
sfSoundRecorder_CanCapture
|
||||
sfSoundStream_Create
|
||||
sfSoundStream_Destroy
|
||||
sfSoundStream_Play
|
||||
sfSoundStream_Pause
|
||||
sfSoundStream_Stop
|
||||
sfSoundStream_GetStatus
|
||||
sfSoundStream_GetChannelsCount
|
||||
sfSoundStream_GetSampleRate
|
||||
sfSoundStream_SetPitch
|
||||
sfSoundStream_SetVolume
|
||||
sfSoundStream_SetPosition
|
||||
sfSoundStream_SetRelativeToListener
|
||||
sfSoundStream_SetMinDistance
|
||||
sfSoundStream_SetAttenuation
|
||||
sfSoundStream_SetPlayingOffset
|
||||
sfSoundStream_SetLoop
|
||||
sfSoundStream_GetPitch
|
||||
sfSoundStream_GetVolume
|
||||
sfSoundStream_GetPosition
|
||||
sfSoundStream_IsRelativeToListener
|
||||
sfSoundStream_GetMinDistance
|
||||
sfSoundStream_GetAttenuation
|
||||
sfSoundStream_GetLoop
|
||||
sfSoundStream_GetPlayingOffset
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-audio-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Audio/csfml-audio-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-audio.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Audio/csfml-audio.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -192,11 +192,11 @@
|
|||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath=".\csfml-audio-d.def"
|
||||
RelativePath="..\..\src\SFML\Audio\csfml-audio-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-audio.def"
|
||||
RelativePath="..\..\src\SFML\Audio\csfml-audio.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-graphics-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-graphics.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -213,11 +213,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-graphics-d.def"
|
||||
RelativePath="..\..\src\SFML\Graphics\csfml-graphics-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-graphics.def"
|
||||
RelativePath="..\..\src\SFML\Graphics\csfml-graphics.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -244,18 +244,6 @@
|
|||
RelativePath="..\..\src\SFML\Graphics\ImageStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\PostFX.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFXStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Rect.cpp"
|
||||
>
|
||||
|
|
@ -288,6 +276,18 @@
|
|||
RelativePath="..\..\src\SFML\Graphics\RenderWindowStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\Shader.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\ShaderStruct.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -1,127 +0,0 @@
|
|||
LIBRARY csfml-network-d
|
||||
EXPORTS
|
||||
sfFtpListingResponse_Destroy
|
||||
sfFtpListingResponse_IsOk
|
||||
sfFtpListingResponse_GetStatus
|
||||
sfFtpListingResponse_GetMessage
|
||||
sfFtpListingResponse_GetCount
|
||||
sfFtpListingResponse_GetFilename
|
||||
sfFtpDirectoryResponse_Destroy
|
||||
sfFtpDirectoryResponse_IsOk
|
||||
sfFtpDirectoryResponse_GetStatus
|
||||
sfFtpDirectoryResponse_GetMessage
|
||||
sfFtpDirectoryResponse_GetDirectory
|
||||
sfFtpResponse_Destroy
|
||||
sfFtpResponse_IsOk
|
||||
sfFtpResponse_GetStatus
|
||||
sfFtpResponse_GetMessage
|
||||
sfFtp_Create
|
||||
sfFtp_Destroy
|
||||
sfFtp_Connect
|
||||
sfFtp_LoginAnonymous
|
||||
sfFtp_Login
|
||||
sfFtp_Disconnect
|
||||
sfFtp_KeepAlive
|
||||
sfFtp_GetWorkingDirectory
|
||||
sfFtp_GetDirectoryListing
|
||||
sfFtp_ChangeDirectory
|
||||
sfFtp_ParentDirectory
|
||||
sfFtp_MakeDirectory
|
||||
sfFtp_DeleteDirectory
|
||||
sfFtp_RenameFile
|
||||
sfFtp_DeleteFile
|
||||
sfFtp_Download
|
||||
sfFtp_Upload
|
||||
sfHttpRequest_Create
|
||||
sfHttpRequest_Destroy
|
||||
sfHttpRequest_SetField
|
||||
sfHttpRequest_SetMethod
|
||||
sfHttpRequest_SetURI
|
||||
sfHttpRequest_SetHttpVersion
|
||||
sfHttpRequest_SetBody
|
||||
sfHttpResponse_Destroy
|
||||
sfHttpResponse_GetField
|
||||
sfHttpResponse_GetStatus
|
||||
sfHttpResponse_GetMajorVersion
|
||||
sfHttpResponse_GetMinorVersion
|
||||
sfHttpResponse_GetBody
|
||||
sfHttp_Create
|
||||
sfHttp_Destroy
|
||||
sfHttp_SetHost
|
||||
sfHttp_SendRequest
|
||||
sfIPAddress_FromString
|
||||
sfIPAddress_FromBytes
|
||||
sfIPAddress_FromInteger
|
||||
sfIPAddress_IsValid
|
||||
sfIPAddress_ToString
|
||||
sfIPAddress_ToInteger
|
||||
sfIPAddress_GetLocalAddress
|
||||
sfIPAddress_GetPublicAddress
|
||||
sfIPAddress_LocalHost
|
||||
sfSocketTCP_Create
|
||||
sfSocketTCP_Destroy
|
||||
sfSocketTCP_SetBlocking
|
||||
sfSocketTCP_Connect
|
||||
sfSocketTCP_Listen
|
||||
sfSocketTCP_Accept
|
||||
sfSocketTCP_Send
|
||||
sfSocketTCP_Receive
|
||||
sfSocketTCP_SendPacket
|
||||
sfSocketTCP_ReceivePacket
|
||||
sfSocketTCP_Close
|
||||
sfSocketTCP_IsValid
|
||||
sfSocketUDP_Create
|
||||
sfSocketUDP_Destroy
|
||||
sfSocketUDP_SetBlocking
|
||||
sfSocketUDP_Bind
|
||||
sfSocketUDP_Unbind
|
||||
sfSocketUDP_Send
|
||||
sfSocketUDP_Receive
|
||||
sfSocketUDP_SendPacket
|
||||
sfSocketUDP_ReceivePacket
|
||||
sfSocketUDP_Close
|
||||
sfSocketUDP_IsValid
|
||||
sfPacket_Create
|
||||
sfPacket_Destroy
|
||||
sfPacket_Append
|
||||
sfPacket_Clear
|
||||
sfPacket_GetData
|
||||
sfPacket_GetDataSize
|
||||
sfPacket_EndOfPacket
|
||||
sfPacket_CanRead
|
||||
sfPacket_ReadBool
|
||||
sfPacket_ReadInt8
|
||||
sfPacket_ReadUint8
|
||||
sfPacket_ReadInt16
|
||||
sfPacket_ReadUint16
|
||||
sfPacket_ReadInt32
|
||||
sfPacket_ReadUint32
|
||||
sfPacket_ReadFloat
|
||||
sfPacket_ReadDouble
|
||||
sfPacket_ReadString
|
||||
sfPacket_ReadWideString
|
||||
sfPacket_WriteBool
|
||||
sfPacket_WriteInt8
|
||||
sfPacket_WriteUint8
|
||||
sfPacket_WriteInt16
|
||||
sfPacket_WriteUint16
|
||||
sfPacket_WriteInt32
|
||||
sfPacket_WriteUint32
|
||||
sfPacket_WriteFloat
|
||||
sfPacket_WriteDouble
|
||||
sfPacket_WriteString
|
||||
sfPacket_WriteWideString
|
||||
sfSelectorTCP_Create
|
||||
sfSelectorTCP_Destroy
|
||||
sfSelectorTCP_Add
|
||||
sfSelectorTCP_Remove
|
||||
sfSelectorTCP_Clear
|
||||
sfSelectorTCP_Wait
|
||||
sfSelectorTCP_GetSocketReady
|
||||
sfSelectorUDP_Create
|
||||
sfSelectorUDP_Destroy
|
||||
sfSelectorUDP_Add
|
||||
sfSelectorUDP_Remove
|
||||
sfSelectorUDP_Clear
|
||||
sfSelectorUDP_Wait
|
||||
sfSelectorUDP_GetSocketReady
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
LIBRARY csfml-network
|
||||
EXPORTS
|
||||
sfFtpListingResponse_Destroy
|
||||
sfFtpListingResponse_IsOk
|
||||
sfFtpListingResponse_GetStatus
|
||||
sfFtpListingResponse_GetMessage
|
||||
sfFtpListingResponse_GetCount
|
||||
sfFtpListingResponse_GetFilename
|
||||
sfFtpDirectoryResponse_Destroy
|
||||
sfFtpDirectoryResponse_IsOk
|
||||
sfFtpDirectoryResponse_GetStatus
|
||||
sfFtpDirectoryResponse_GetMessage
|
||||
sfFtpDirectoryResponse_GetDirectory
|
||||
sfFtpResponse_Destroy
|
||||
sfFtpResponse_IsOk
|
||||
sfFtpResponse_GetStatus
|
||||
sfFtpResponse_GetMessage
|
||||
sfFtp_Create
|
||||
sfFtp_Destroy
|
||||
sfFtp_Connect
|
||||
sfFtp_LoginAnonymous
|
||||
sfFtp_Login
|
||||
sfFtp_Disconnect
|
||||
sfFtp_KeepAlive
|
||||
sfFtp_GetWorkingDirectory
|
||||
sfFtp_GetDirectoryListing
|
||||
sfFtp_ChangeDirectory
|
||||
sfFtp_ParentDirectory
|
||||
sfFtp_MakeDirectory
|
||||
sfFtp_DeleteDirectory
|
||||
sfFtp_RenameFile
|
||||
sfFtp_DeleteFile
|
||||
sfFtp_Download
|
||||
sfFtp_Upload
|
||||
sfHttpRequest_Create
|
||||
sfHttpRequest_Destroy
|
||||
sfHttpRequest_SetField
|
||||
sfHttpRequest_SetMethod
|
||||
sfHttpRequest_SetURI
|
||||
sfHttpRequest_SetHttpVersion
|
||||
sfHttpRequest_SetBody
|
||||
sfHttpResponse_Destroy
|
||||
sfHttpResponse_GetField
|
||||
sfHttpResponse_GetStatus
|
||||
sfHttpResponse_GetMajorVersion
|
||||
sfHttpResponse_GetMinorVersion
|
||||
sfHttpResponse_GetBody
|
||||
sfHttp_Create
|
||||
sfHttp_Destroy
|
||||
sfHttp_SetHost
|
||||
sfHttp_SendRequest
|
||||
sfIPAddress_FromString
|
||||
sfIPAddress_FromBytes
|
||||
sfIPAddress_FromInteger
|
||||
sfIPAddress_IsValid
|
||||
sfIPAddress_ToString
|
||||
sfIPAddress_ToInteger
|
||||
sfIPAddress_GetLocalAddress
|
||||
sfIPAddress_GetPublicAddress
|
||||
sfIPAddress_LocalHost
|
||||
sfSocketTCP_Create
|
||||
sfSocketTCP_Destroy
|
||||
sfSocketTCP_SetBlocking
|
||||
sfSocketTCP_Connect
|
||||
sfSocketTCP_Listen
|
||||
sfSocketTCP_Accept
|
||||
sfSocketTCP_Send
|
||||
sfSocketTCP_Receive
|
||||
sfSocketTCP_SendPacket
|
||||
sfSocketTCP_ReceivePacket
|
||||
sfSocketTCP_Close
|
||||
sfSocketTCP_IsValid
|
||||
sfSocketUDP_Create
|
||||
sfSocketUDP_Destroy
|
||||
sfSocketUDP_SetBlocking
|
||||
sfSocketUDP_Bind
|
||||
sfSocketUDP_Unbind
|
||||
sfSocketUDP_Send
|
||||
sfSocketUDP_Receive
|
||||
sfSocketUDP_SendPacket
|
||||
sfSocketUDP_ReceivePacket
|
||||
sfSocketUDP_Close
|
||||
sfSocketUDP_IsValid
|
||||
sfPacket_Create
|
||||
sfPacket_Destroy
|
||||
sfPacket_Append
|
||||
sfPacket_Clear
|
||||
sfPacket_GetData
|
||||
sfPacket_GetDataSize
|
||||
sfPacket_EndOfPacket
|
||||
sfPacket_CanRead
|
||||
sfPacket_ReadBool
|
||||
sfPacket_ReadInt8
|
||||
sfPacket_ReadUint8
|
||||
sfPacket_ReadInt16
|
||||
sfPacket_ReadUint16
|
||||
sfPacket_ReadInt32
|
||||
sfPacket_ReadUint32
|
||||
sfPacket_ReadFloat
|
||||
sfPacket_ReadDouble
|
||||
sfPacket_ReadString
|
||||
sfPacket_ReadWideString
|
||||
sfPacket_WriteBool
|
||||
sfPacket_WriteInt8
|
||||
sfPacket_WriteUint8
|
||||
sfPacket_WriteInt16
|
||||
sfPacket_WriteUint16
|
||||
sfPacket_WriteInt32
|
||||
sfPacket_WriteUint32
|
||||
sfPacket_WriteFloat
|
||||
sfPacket_WriteDouble
|
||||
sfPacket_WriteString
|
||||
sfPacket_WriteWideString
|
||||
sfSelectorTCP_Create
|
||||
sfSelectorTCP_Destroy
|
||||
sfSelectorTCP_Add
|
||||
sfSelectorTCP_Remove
|
||||
sfSelectorTCP_Clear
|
||||
sfSelectorTCP_Wait
|
||||
sfSelectorTCP_GetSocketReady
|
||||
sfSelectorUDP_Create
|
||||
sfSelectorUDP_Destroy
|
||||
sfSelectorUDP_Add
|
||||
sfSelectorUDP_Remove
|
||||
sfSelectorUDP_Clear
|
||||
sfSelectorUDP_Wait
|
||||
sfSelectorUDP_GetSocketReady
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-network-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Network/csfml-network-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-network.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Network/csfml-network.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -190,11 +190,11 @@
|
|||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath=".\csfml-network-d.def"
|
||||
RelativePath="..\..\src\SFML\Network\csfml-network-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-network.def"
|
||||
RelativePath="..\..\src\SFML\Network\csfml-network.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
LIBRARY csfml-system-d
|
||||
EXPORTS
|
||||
sfClock_Create
|
||||
sfClock_Destroy
|
||||
sfClock_GetTime
|
||||
sfClock_Reset
|
||||
sfMutex_Create
|
||||
sfMutex_Destroy
|
||||
sfMutex_Lock
|
||||
sfMutex_Unlock
|
||||
sfRandom_SetSeed
|
||||
sfRandom_GetSeed
|
||||
sfRandom_Float
|
||||
sfRandom_Int
|
||||
sfSleep
|
||||
sfThread_Create
|
||||
sfThread_Destroy
|
||||
sfThread_Launch
|
||||
sfThread_Wait
|
||||
sfThread_Terminate
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
LIBRARY csfml-system
|
||||
EXPORTS
|
||||
sfClock_Create
|
||||
sfClock_Destroy
|
||||
sfClock_GetTime
|
||||
sfClock_Reset
|
||||
sfMutex_Create
|
||||
sfMutex_Destroy
|
||||
sfMutex_Lock
|
||||
sfMutex_Unlock
|
||||
sfRandom_SetSeed
|
||||
sfRandom_GetSeed
|
||||
sfRandom_Float
|
||||
sfRandom_Int
|
||||
sfSleep
|
||||
sfThread_Create
|
||||
sfThread_Destroy
|
||||
sfThread_Launch
|
||||
sfThread_Wait
|
||||
sfThread_Terminate
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-system-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/System/csfml-system-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-system.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/System/csfml-system.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -202,11 +202,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-system-d.def"
|
||||
RelativePath="..\..\src\SFML\System\csfml-system-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-system.def"
|
||||
RelativePath="..\..\src\SFML\System\csfml-system.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
LIBRARY csfml-window-d
|
||||
EXPORTS
|
||||
sfInput_IsKeyDown
|
||||
sfInput_IsMouseButtonDown
|
||||
sfInput_IsJoystickButtonDown
|
||||
sfInput_GetMouseX
|
||||
sfInput_GetMouseY
|
||||
sfInput_GetJoystickAxis
|
||||
sfVideoMode_GetDesktopMode
|
||||
sfVideoMode_GetMode
|
||||
sfVideoMode_GetModesCount
|
||||
sfVideoMode_IsValid
|
||||
sfWindow_Create
|
||||
sfWindow_CreateFromHandle
|
||||
sfWindow_Close
|
||||
sfWindow_IsOpened
|
||||
sfWindow_Destroy
|
||||
sfWindow_GetWidth
|
||||
sfWindow_GetHeight
|
||||
sfWindow_GetSettings
|
||||
sfWindow_GetEvent
|
||||
sfWindow_WaitEvent
|
||||
sfWindow_UseVerticalSync
|
||||
sfWindow_ShowMouseCursor
|
||||
sfWindow_SetCursorPosition
|
||||
sfWindow_SetPosition
|
||||
sfWindow_SetSize
|
||||
sfWindow_Show
|
||||
sfWindow_EnableKeyRepeat
|
||||
sfWindow_SetIcon
|
||||
sfWindow_SetActive
|
||||
sfWindow_Display
|
||||
sfWindow_GetInput
|
||||
sfWindow_SetFramerateLimit
|
||||
sfWindow_GetFrameTime
|
||||
sfWindow_SetJoystickThreshold
|
||||
sfContext_Create
|
||||
sfContext_Destroy
|
||||
sfContext_SetActive
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
LIBRARY csfml-window
|
||||
EXPORTS
|
||||
sfInput_IsKeyDown
|
||||
sfInput_IsMouseButtonDown
|
||||
sfInput_IsJoystickButtonDown
|
||||
sfInput_GetMouseX
|
||||
sfInput_GetMouseY
|
||||
sfInput_GetJoystickAxis
|
||||
sfVideoMode_GetDesktopMode
|
||||
sfVideoMode_GetMode
|
||||
sfVideoMode_GetModesCount
|
||||
sfVideoMode_IsValid
|
||||
sfWindow_Create
|
||||
sfWindow_CreateFromHandle
|
||||
sfWindow_Close
|
||||
sfWindow_IsOpened
|
||||
sfWindow_Destroy
|
||||
sfWindow_GetWidth
|
||||
sfWindow_GetHeight
|
||||
sfWindow_GetSettings
|
||||
sfWindow_GetEvent
|
||||
sfWindow_WaitEvent
|
||||
sfWindow_UseVerticalSync
|
||||
sfWindow_ShowMouseCursor
|
||||
sfWindow_SetCursorPosition
|
||||
sfWindow_SetPosition
|
||||
sfWindow_SetSize
|
||||
sfWindow_Show
|
||||
sfWindow_EnableKeyRepeat
|
||||
sfWindow_SetIcon
|
||||
sfWindow_SetActive
|
||||
sfWindow_Display
|
||||
sfWindow_GetInput
|
||||
sfWindow_SetFramerateLimit
|
||||
sfWindow_GetFrameTime
|
||||
sfWindow_SetJoystickThreshold
|
||||
sfContext_Create
|
||||
sfContext_Destroy
|
||||
sfContext_SetActive
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-window-d.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Window/csfml-window-d.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
|
||||
ModuleDefinitionFile="$(SolutionDir)/csfml-window.def"
|
||||
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Window/csfml-window.def"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
|
|
@ -204,11 +204,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-window-d.def"
|
||||
RelativePath="..\..\src\SFML\Window\csfml-window-d.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\csfml-window.def"
|
||||
RelativePath="..\..\src\SFML\Window\csfml-window.def"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
<Unit filename="..\..\include\SFML\Graphics\Color.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\Font.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\Image.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\PostFX.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\Shader.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\Rect.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\RenderWindow.h" />
|
||||
<Unit filename="..\..\include\SFML\Graphics\Shape.h" />
|
||||
|
|
@ -72,8 +72,8 @@
|
|||
<Unit filename="..\..\src\SFML\Graphics\FontStruct.h" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\Image.cpp" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\ImageStruct.h" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\PostFX.cpp" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\PostFXStruct.h" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\Shader.cpp" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\ShaderStruct.h" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\Rect.cpp" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\RenderImage.cpp" />
|
||||
<Unit filename="..\..\src\SFML\Graphics\RenderImageStruct.h" />
|
||||
|
|
|
|||
|
|
@ -31,10 +31,12 @@
|
|||
|
||||
#include <SFML/Window.h>
|
||||
#include <SFML/Graphics/Color.h>
|
||||
#include <SFML/Graphics/Font.h>
|
||||
#include <SFML/Graphics/Image.h>
|
||||
#include <SFML/Graphics/PostFX.h>
|
||||
#include <SFML/Graphics/Rect.h>
|
||||
#include <SFML/Graphics/RenderWindow.h>
|
||||
#include <SFML/Graphics/RenderImage.h>
|
||||
#include <SFML/Graphics/Shader.h>
|
||||
#include <SFML/Graphics/Shape.h>
|
||||
#include <SFML/Graphics/Sprite.h>
|
||||
#include <SFML/Graphics/String.h>
|
||||
|
|
|
|||
|
|
@ -112,15 +112,26 @@ CSFML_API void sfRenderImage_Display(sfRenderImage* renderImage);
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderimage
|
||||
///
|
||||
/// \param renderImage : Renderimage to draw in
|
||||
/// \param postFX / sprite / string / shape : Object to draw
|
||||
/// \param renderImage : Renderimage to draw in
|
||||
/// \param sprite / string / shape : Object to draw
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderImage_DrawPostFX(sfRenderImage* renderImage, sfPostFX* postFX);
|
||||
CSFML_API void sfRenderImage_DrawSprite(sfRenderImage* renderImage, sfSprite* sprite);
|
||||
CSFML_API void sfRenderImage_DrawShape (sfRenderImage* renderImage, sfShape* shape);
|
||||
CSFML_API void sfRenderImage_DrawString(sfRenderImage* renderImage, sfString* string);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderimage with a shader
|
||||
///
|
||||
/// \param renderImage : Renderimage to draw in
|
||||
/// \param sprite / string / shape : Object to draw
|
||||
/// \param shader : Shader to use
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderImage_DrawSpriteWithShader(sfRenderImage* renderImage, sfSprite* sprite, sfShader* shader);
|
||||
CSFML_API void sfRenderImage_DrawShapeWithShader (sfRenderImage* renderImage, sfShape* shape, sfShader* shader);
|
||||
CSFML_API void sfRenderImage_DrawStringWithShader(sfRenderImage* renderImage, sfString* string, sfShader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Clear the renderimage with the given color
|
||||
///
|
||||
|
|
@ -199,7 +210,7 @@ CSFML_API sfImage* sfRenderImage_GetImage(sfRenderImage* renderImage);
|
|||
/// \return sfTrue if the RenderImage class can be used
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API sfBool sfRenderImage_CanUseRenderImage();
|
||||
CSFML_API sfBool sfRenderImage_IsAvailable();
|
||||
|
||||
|
||||
#endif // SFML_RENDERIMAGE_H
|
||||
|
|
|
|||
|
|
@ -292,15 +292,26 @@ CSFML_API void sfRenderWindow_SetJoystickThreshold(sfRenderWindow* renderWindow,
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderwindow
|
||||
///
|
||||
/// \param renderWindow : Renderwindow to draw in
|
||||
/// \param postFX / sprite / string / shape : Object to draw
|
||||
/// \param renderWindow : Renderwindow to draw in
|
||||
/// \param sprite / string / shape : Object to draw
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderWindow_DrawPostFX(sfRenderWindow* renderWindow, sfPostFX* postFX);
|
||||
CSFML_API void sfRenderWindow_DrawSprite(sfRenderWindow* renderWindow, sfSprite* sprite);
|
||||
CSFML_API void sfRenderWindow_DrawShape (sfRenderWindow* renderWindow, sfShape* shape);
|
||||
CSFML_API void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderwindow with a shader
|
||||
///
|
||||
/// \param renderWindow : Renderwindow to draw in
|
||||
/// \param sprite / string / shape : Object to draw
|
||||
/// \param shader : Shader to use
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfRenderWindow_DrawSpriteWithShader(sfRenderWindow* renderWindow, sfSprite* sprite, sfShader* shader);
|
||||
CSFML_API void sfRenderWindow_DrawShapeWithShader (sfRenderWindow* renderWindow, sfShape* shape, sfShader* shader);
|
||||
CSFML_API void sfRenderWindow_DrawStringWithShader(sfRenderWindow* renderWindow, sfString* string, sfShader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Clear the screen with the given color
|
||||
///
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_POSTFX_H
|
||||
#define SFML_POSTFX_H
|
||||
#ifndef SFML_SHADER_H
|
||||
#define SFML_SHADER_H
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
|
|
@ -33,90 +33,106 @@
|
|||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create a new post-fx from a file
|
||||
/// Create a new shader from a file
|
||||
///
|
||||
/// \param filename : File to load
|
||||
///
|
||||
/// \return A new sfPostFX object, or NULL if it failed
|
||||
/// \return A new sfShader object, or NULL if it failed
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API sfPostFX* sfPostFX_CreateFromFile(const char* Filename);
|
||||
CSFML_API sfShader* sfShader_CreateFromFile(const char* Filename);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create a new post-fx from an effect source code
|
||||
/// Create a new shader from an effect source code
|
||||
///
|
||||
/// \param effect : Source code of the effect
|
||||
///
|
||||
/// \return A new sfPostFX object, or NULL if it failed
|
||||
/// \return A new sfShader object, or NULL if it failed
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API sfPostFX* sfPostFX_CreateFromMemory(const char* effect);
|
||||
CSFML_API sfShader* sfShader_CreateFromMemory(const char* effect);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing post-fx
|
||||
/// Destroy an existing shader
|
||||
///
|
||||
/// \param postFX : PostFX to delete
|
||||
/// \param shader : Shader to delete
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_Destroy(sfPostFX* postFX);
|
||||
CSFML_API void sfShader_Destroy(sfShader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (1 float)
|
||||
/// Change a parameter of a shader (1 float)
|
||||
///
|
||||
/// \param postFX : Post-effect to modify
|
||||
/// \param shader : Shader to modify
|
||||
/// \param name : Parameter name in the effect
|
||||
/// \param x : Value to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_SetParameter1(sfPostFX* postFX, const char* name, float x);
|
||||
CSFML_API void sfShader_SetParameter1(sfShader* shader, const char* name, float x);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (2 floats)
|
||||
/// Change a parameter of a shader (2 floats)
|
||||
///
|
||||
/// \param postFX : Post-effect to modify
|
||||
/// \param shader : Shader to modify
|
||||
/// \param name : Parameter name in the effect
|
||||
/// \param x, y : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_SetParameter2(sfPostFX* postFX, const char* name, float x, float y);
|
||||
CSFML_API void sfShader_SetParameter2(sfShader* shader, const char* name, float x, float y);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (3 floats)
|
||||
/// Change a parameter of a shader (3 floats)
|
||||
///
|
||||
/// \param postFX : Post-effect to modify
|
||||
/// \param shader : Shader to modify
|
||||
/// \param name : Parameter name in the effect
|
||||
/// \param x, y, z : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_SetParameter3(sfPostFX* postFX, const char* name, float x, float y, float z);
|
||||
CSFML_API void sfShader_SetParameter3(sfShader* shader, const char* name, float x, float y, float z);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (4 floats)
|
||||
/// Change a parameter of a shader (4 floats)
|
||||
///
|
||||
/// \param postFX : Post-effect to modify
|
||||
/// \param shader : Shader to modify
|
||||
/// \param name : Parameter name in the effect
|
||||
/// \param x, y, z, w : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_SetParameter4(sfPostFX* postFX, const char* name, float x, float y, float z, float w);
|
||||
CSFML_API void sfShader_SetParameter4(sfShader* shader, const char* name, float x, float y, float z, float w);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Set a texture parameter in a post-fx
|
||||
/// Set a texture parameter in a shader
|
||||
///
|
||||
/// \param postFX : Post-effect to modify
|
||||
/// \param shader : Shader to modify
|
||||
/// \param name : Texture name in the effect
|
||||
/// \param texture : Image to set (pass NULL to use content of current framebuffer)
|
||||
/// \param texture : Image to set (pass NULL to use the texture of the object being drawn)
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfPostFX_SetTexture(sfPostFX* postFX, const char* name, sfImage* texture);
|
||||
CSFML_API void sfShader_SetTexture(sfShader* shader, const char* name, sfImage* texture);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Tell whether or not the system supports post-effects
|
||||
/// Bind a shader for rendering
|
||||
///
|
||||
/// \return sfTrue if the system can use post-effects
|
||||
/// \param shader : Shader to bind
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API sfBool sfPostFX_CanUsePostFX();
|
||||
CSFML_API void sfShader_Bind(sfShader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Unbind a shader
|
||||
///
|
||||
/// \param shader : Shader to unbind
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API void sfShader_Unbind(sfShader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Tell whether or not the system supports shaders
|
||||
///
|
||||
/// \return sfTrue if the system can use shaders
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_API sfBool sfShader_IsAvailable();
|
||||
|
||||
|
||||
#endif // SFML_POSTFX_H
|
||||
#endif // SFML_SHADER_H
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
typedef struct sfFont sfFont;
|
||||
typedef struct sfImage sfImage;
|
||||
typedef struct sfPostFX sfPostFX;
|
||||
typedef struct sfShader sfShader;
|
||||
typedef struct sfRenderImage sfRenderImage;
|
||||
typedef struct sfRenderWindow sfRenderWindow;
|
||||
typedef struct sfShape sfShape;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ unsigned int sfSoundRecorder_GetSampleRate(sfSoundRecorder* soundRecorder)
|
|||
/// Tell if the system supports sound capture.
|
||||
/// If not, this class won't be usable
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfSoundRecorder_CanCapture()
|
||||
sfBool sfSoundRecorder_IsAvailable()
|
||||
{
|
||||
return sf::SoundRecorder::CanCapture() ? sfTrue : sfFalse;
|
||||
return sf::SoundRecorder::IsAvailable() ? sfTrue : sfFalse;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ EXPORTS
|
|||
sfSoundRecorder_Start
|
||||
sfSoundRecorder_Stop
|
||||
sfSoundRecorder_GetSampleRate
|
||||
sfSoundRecorder_CanCapture
|
||||
sfSoundRecorder_IsAvailable
|
||||
sfSoundStream_Create
|
||||
sfSoundStream_Destroy
|
||||
sfSoundStream_Play
|
||||
|
|
@ -77,7 +77,7 @@ EXPORTS
|
|||
sfSoundRecorder_Start
|
||||
sfSoundRecorder_Stop
|
||||
sfSoundRecorder_GetSampleRate
|
||||
sfSoundRecorder_CanCapture
|
||||
sfSoundRecorder_IsAvailable
|
||||
sfSoundStream_Create
|
||||
sfSoundStream_Destroy
|
||||
sfSoundStream_Play
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
#include <SFML/Graphics/RenderImage.h>
|
||||
#include <SFML/Graphics/RenderImageStruct.h>
|
||||
#include <SFML/Graphics/ShapeStruct.h>
|
||||
#include <SFML/Graphics/PostFXStruct.h>
|
||||
#include <SFML/Graphics/ShaderStruct.h>
|
||||
#include <SFML/Graphics/SpriteStruct.h>
|
||||
#include <SFML/Graphics/StringStruct.h>
|
||||
#include <SFML/Internal.h>
|
||||
|
|
@ -118,21 +118,16 @@ void sfRenderImage_Display(sfRenderImage* renderImage)
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderimage
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderImage_DrawPostFX(sfRenderImage* renderImage, sfPostFX* postFX)
|
||||
void sfRenderImage_DrawSprite(sfRenderImage* renderImage, sfSprite* sprite)
|
||||
{
|
||||
CSFML_CHECK(postFX);
|
||||
CSFML_CALL(renderImage, Draw(postFX->This));
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CALL(renderImage, Draw(sprite->This));
|
||||
}
|
||||
void sfRenderImage_DrawShape(sfRenderImage* renderImage, sfShape* shape)
|
||||
{
|
||||
CSFML_CHECK(shape);
|
||||
CSFML_CALL(renderImage, Draw(shape->This));
|
||||
}
|
||||
void sfRenderImage_DrawSprite(sfRenderImage* renderImage, sfSprite* sprite)
|
||||
{
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CALL(renderImage, Draw(sprite->This));
|
||||
}
|
||||
void sfRenderImage_DrawString(sfRenderImage* renderImage, sfString* string)
|
||||
{
|
||||
CSFML_CHECK(string);
|
||||
|
|
@ -140,6 +135,29 @@ void sfRenderImage_DrawString(sfRenderImage* renderImage, sfString* string)
|
|||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderimage with a shader
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderImage_DrawSpriteWithShader(sfRenderImage* renderImage, sfSprite* sprite, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderImage, Draw(sprite->This, shader->This));
|
||||
}
|
||||
void sfRenderImage_DrawShapeWithShader(sfRenderImage* renderImage, sfShape* shape, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(shape);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderImage, Draw(shape->This, shader->This));
|
||||
}
|
||||
void sfRenderImage_DrawStringWithShader(sfRenderImage* renderImage, sfString* string, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(string);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderImage, Draw(string->This, shader->This));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Clear the renderimage with the given color
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
@ -235,7 +253,7 @@ sfImage* sfRenderImage_GetImage(sfRenderImage* renderImage)
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Check whether the system supports render images or not
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfRenderImage_CanUseRenderImage()
|
||||
sfBool sfRenderImage_IsAvailable()
|
||||
{
|
||||
return sf::RenderImage::CanUseRenderImage();
|
||||
return sf::RenderImage::IsAvailable() ? sfTrue : sfFalse;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include <SFML/Graphics/RenderWindow.h>
|
||||
#include <SFML/Graphics/RenderWindowStruct.h>
|
||||
#include <SFML/Graphics/ShapeStruct.h>
|
||||
#include <SFML/Graphics/PostFXStruct.h>
|
||||
#include <SFML/Graphics/ShaderStruct.h>
|
||||
#include <SFML/Graphics/ImageStruct.h>
|
||||
#include <SFML/Graphics/SpriteStruct.h>
|
||||
#include <SFML/Graphics/StringStruct.h>
|
||||
|
|
@ -335,21 +335,16 @@ void sfRenderWindow_SetJoystickThreshold(sfRenderWindow* renderWindow, float thr
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderwindow
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_DrawPostFX(sfRenderWindow* renderWindow, sfPostFX* postFX)
|
||||
void sfRenderWindow_DrawSprite(sfRenderWindow* renderWindow, sfSprite* sprite)
|
||||
{
|
||||
CSFML_CHECK(postFX);
|
||||
CSFML_CALL(renderWindow, Draw(postFX->This));
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CALL(renderWindow, Draw(sprite->This));
|
||||
}
|
||||
void sfRenderWindow_DrawShape(sfRenderWindow* renderWindow, sfShape* shape)
|
||||
{
|
||||
CSFML_CHECK(shape);
|
||||
CSFML_CALL(renderWindow, Draw(shape->This));
|
||||
}
|
||||
void sfRenderWindow_DrawSprite(sfRenderWindow* renderWindow, sfSprite* sprite)
|
||||
{
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CALL(renderWindow, Draw(sprite->This));
|
||||
}
|
||||
void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string)
|
||||
{
|
||||
CSFML_CHECK(string);
|
||||
|
|
@ -357,6 +352,29 @@ void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string)
|
|||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Draw something on a renderwindow with a shader
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_DrawSpriteWithShader(sfRenderWindow* renderWindow, sfSprite* sprite, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(sprite);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderWindow, Draw(sprite->This, shader->This));
|
||||
}
|
||||
void sfRenderWindow_DrawShapeWithShader(sfRenderWindow* renderWindow, sfShape* shape, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(shape);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderWindow, Draw(shape->This, shader->This));
|
||||
}
|
||||
void sfRenderWindow_DrawStringWithShader(sfRenderWindow* renderWindow, sfString* string, sfShader* shader)
|
||||
{
|
||||
CSFML_CHECK(string);
|
||||
CSFML_CHECK(shader);
|
||||
CSFML_CALL(renderWindow, Draw(string->This, shader->This));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Clear the screen with the given color
|
||||
////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -25,104 +25,122 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Graphics/PostFX.h>
|
||||
#include <SFML/Graphics/PostFXStruct.h>
|
||||
#include <SFML/Graphics/Shader.h>
|
||||
#include <SFML/Graphics/ShaderStruct.h>
|
||||
#include <SFML/Graphics/ImageStruct.h>
|
||||
#include <SFML/Internal.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create a new post-fx from a file
|
||||
/// Create a new shader from a file
|
||||
////////////////////////////////////////////////////////////
|
||||
sfPostFX* sfPostFX_CreateFromFile(const char* filename)
|
||||
sfShader* sfShader_CreateFromFile(const char* filename)
|
||||
{
|
||||
sfPostFX* postFX = new sfPostFX;
|
||||
sfShader* shader = new sfShader;
|
||||
|
||||
if (!postFX->This.LoadFromFile(filename))
|
||||
if (!shader->This.LoadFromFile(filename))
|
||||
{
|
||||
delete postFX;
|
||||
postFX = NULL;
|
||||
delete shader;
|
||||
shader = NULL;
|
||||
}
|
||||
|
||||
return postFX;
|
||||
return shader;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create a new post-fx from an effect source code
|
||||
/// Create a new shader from an effect source code
|
||||
////////////////////////////////////////////////////////////
|
||||
sfPostFX* sfPostFX_CreateFromMemory(const char* effect)
|
||||
sfShader* sfShader_CreateFromMemory(const char* effect)
|
||||
{
|
||||
sfPostFX* postFX = new sfPostFX;
|
||||
sfShader* shader = new sfShader;
|
||||
|
||||
if (!postFX->This.LoadFromMemory(effect))
|
||||
if (!shader->This.LoadFromMemory(effect))
|
||||
{
|
||||
delete postFX;
|
||||
postFX = NULL;
|
||||
delete shader;
|
||||
shader = NULL;
|
||||
}
|
||||
|
||||
return postFX;
|
||||
return shader;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destroy an existing post-fx
|
||||
/// Destroy an existing shader
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_Destroy(sfPostFX* postFX)
|
||||
void sfShader_Destroy(sfShader* shader)
|
||||
{
|
||||
delete postFX;
|
||||
delete shader;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (1 float)
|
||||
/// Change a parameter of a shader (1 float)
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_SetParameter1(sfPostFX* postFX, const char* name, float x)
|
||||
void sfShader_SetParameter1(sfShader* shader, const char* name, float x)
|
||||
{
|
||||
CSFML_CALL(postFX, SetParameter(name, x))
|
||||
CSFML_CALL(shader, SetParameter(name, x))
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (2 floats)
|
||||
/// Change a parameter of a shader (2 floats)
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_SetParameter2(sfPostFX* postFX, const char* name, float x, float y)
|
||||
void sfShader_SetParameter2(sfShader* shader, const char* name, float x, float y)
|
||||
{
|
||||
CSFML_CALL(postFX, SetParameter(name, x, y))
|
||||
CSFML_CALL(shader, SetParameter(name, x, y))
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (3 floats)
|
||||
/// Change a parameter of a shader (3 floats)
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_SetParameter3(sfPostFX* postFX, const char* name, float x, float y, float z)
|
||||
void sfShader_SetParameter3(sfShader* shader, const char* name, float x, float y, float z)
|
||||
{
|
||||
CSFML_CALL(postFX, SetParameter(name, x, y, z))
|
||||
CSFML_CALL(shader, SetParameter(name, x, y, z))
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of a post-fx (4 floats)
|
||||
/// Change a parameter of a shader (4 floats)
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_SetParameter4(sfPostFX* postFX, const char* name, float x, float y, float z, float w)
|
||||
void sfShader_SetParameter4(sfShader* shader, const char* name, float x, float y, float z, float w)
|
||||
{
|
||||
CSFML_CALL(postFX, SetParameter(name, x, y, z, w))
|
||||
CSFML_CALL(shader, SetParameter(name, x, y, z, w))
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Set a texture parameter in a post-fx
|
||||
/// Set a texture parameter in a shader
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfPostFX_SetTexture(sfPostFX* postFX, const char* name, sfImage* texture)
|
||||
void sfShader_SetTexture(sfShader* shader, const char* name, sfImage* texture)
|
||||
{
|
||||
CSFML_CALL(postFX, SetTexture(name, texture ? texture->This : NULL))
|
||||
CSFML_CALL(shader, SetTexture(name, texture && texture->This ? *texture->This : sf::Shader::CurrentTexture))
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Tell whether or not the system supports post-effects
|
||||
/// Bind a shader for rendering
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfPostFX_CanUsePostFX()
|
||||
void sfShader_Bind(sfShader* shader)
|
||||
{
|
||||
return sf::PostFX::CanUsePostFX() ? sfTrue : sfFalse;
|
||||
CSFML_CALL(shader, Bind())
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Unbind a shader
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfShader_Unbind(sfShader* shader)
|
||||
{
|
||||
CSFML_CALL(shader, Unbind())
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Tell whether or not the system supports shaders
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfShader_IsAvailable()
|
||||
{
|
||||
return sf::Shader::IsAvailable() ? sfTrue : sfFalse;
|
||||
}
|
||||
|
|
@ -22,22 +22,22 @@
|
|||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_POSTFXSTRUCT_H
|
||||
#define SFML_POSTFXSTRUCT_H
|
||||
#ifndef SFML_SHADERSTRUCT_H
|
||||
#define SFML_SHADERSTRUCT_H
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Graphics/PostFX.hpp>
|
||||
#include <SFML/Graphics/Shader.hpp>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Internal structure of sfPostFX
|
||||
// Internal structure of sfShader
|
||||
////////////////////////////////////////////////////////////
|
||||
struct sfPostFX
|
||||
struct sfShader
|
||||
{
|
||||
sf::PostFX This;
|
||||
sf::Shader This;
|
||||
};
|
||||
|
||||
|
||||
#endif // SFML_POSTFXSTRUCT_H
|
||||
#endif // SFML_SHADERSTRUCT_H
|
||||
|
|
@ -251,7 +251,7 @@ float sfShape_GetOriginY(sfShape* shape)
|
|||
sfColor sfShape_GetColor(sfShape* shape)
|
||||
{
|
||||
sfColor color = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(Shape, color)
|
||||
CSFML_CHECK_RETURN(shape, color)
|
||||
|
||||
sf::Color SFMLColor = shape->This.GetColor();
|
||||
return sfColor_FromRGBA(SFMLColor.r, SFMLColor.g, SFMLColor.b, SFMLColor.a);
|
||||
|
|
@ -402,7 +402,7 @@ void sfShape_GetPointPosition(sfShape* shape, unsigned int index, float* x, floa
|
|||
sfColor sfShape_GetPointColor(sfShape* shape, unsigned int index)
|
||||
{
|
||||
sfColor color = {255, 255, 255, 255};
|
||||
CSFML_CHECK_RETURN(Shape, color)
|
||||
CSFML_CHECK_RETURN(shape, color)
|
||||
|
||||
const sf::Color& SFMLColor = shape->This.GetPointColor(index);
|
||||
color.r = SFMLColor.r;
|
||||
|
|
@ -420,7 +420,7 @@ sfColor sfShape_GetPointColor(sfShape* shape, unsigned int index)
|
|||
sfColor sfShape_GetPointOutlineColor(sfShape* shape, unsigned int index)
|
||||
{
|
||||
sfColor color = {255, 255, 255, 255};
|
||||
CSFML_CHECK_RETURN(Shape, color)
|
||||
CSFML_CHECK_RETURN(shape, color)
|
||||
|
||||
const sf::Color& SFMLColor = shape->This.GetPointOutlineColor(index);
|
||||
color.r = SFMLColor.r;
|
||||
|
|
|
|||
|
|
@ -36,15 +36,17 @@ EXPORTS
|
|||
sfIntRect_Offset
|
||||
sfIntRect_Contains
|
||||
sfIntRect_Intersects
|
||||
sfPostFX_CreateFromFile
|
||||
sfPostFX_CreateFromMemory
|
||||
sfPostFX_Destroy
|
||||
sfPostFX_SetParameter1
|
||||
sfPostFX_SetParameter2
|
||||
sfPostFX_SetParameter3
|
||||
sfPostFX_SetParameter4
|
||||
sfPostFX_SetTexture
|
||||
sfPostFX_CanUsePostFX
|
||||
sfShader_CreateFromFile
|
||||
sfShader_CreateFromMemory
|
||||
sfShader_Destroy
|
||||
sfShader_SetParameter1
|
||||
sfShader_SetParameter2
|
||||
sfShader_SetParameter3
|
||||
sfShader_SetParameter4
|
||||
sfShader_SetTexture
|
||||
sfShader_Bind
|
||||
sfShader_Unbind
|
||||
sfShader_IsAvailable
|
||||
sfShape_Create
|
||||
sfShape_CreateLine
|
||||
sfShape_CreateRectangle
|
||||
|
|
@ -173,17 +175,18 @@ EXPORTS
|
|||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawPostFX
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
sfRenderImage_DrawString
|
||||
sfRenderImage_DrawSpriteWithShader
|
||||
sfRenderImage_DrawShapeWithShader
|
||||
sfRenderImage_DrawStringWithShader
|
||||
sfRenderImage_Clear
|
||||
sfRenderImage_SetView
|
||||
sfRenderImage_GetView
|
||||
sfRenderImage_GetDefaultView
|
||||
sfRenderImage_PreserveOpenGLStates
|
||||
sfRenderImage_GetImage
|
||||
sfRenderImage_CanUseRenderImage
|
||||
sfRenderImage_IsAvailable
|
||||
sfRenderWindow_Create
|
||||
sfRenderWindow_CreateFromHandle
|
||||
sfRenderWindow_Destroy
|
||||
|
|
@ -209,16 +212,17 @@ EXPORTS
|
|||
sfRenderWindow_SetFramerateLimit
|
||||
sfRenderWindow_GetFrameTime
|
||||
sfRenderWindow_SetJoystickThreshold
|
||||
sfRenderWindow_DrawPostFX
|
||||
sfRenderWindow_DrawSprite
|
||||
sfRenderWindow_DrawString
|
||||
sfRenderWindow_DrawShape
|
||||
sfRenderWindow_DrawSpriteWithShader
|
||||
sfRenderWindow_DrawStringWithShader
|
||||
sfRenderWindow_DrawShapeWithShader
|
||||
sfRenderWindow_Clear
|
||||
sfRenderWindow_SetView
|
||||
sfRenderWindow_GetView
|
||||
sfRenderWindow_GetDefaultView
|
||||
sfRenderWindow_ConvertCoords
|
||||
sfRenderWindow_PreserveOpenGLStates
|
||||
sfView_Create
|
||||
sfView_CreateFromRect
|
||||
sfView_Destroy
|
||||
|
|
@ -36,15 +36,17 @@ EXPORTS
|
|||
sfIntRect_Offset
|
||||
sfIntRect_Contains
|
||||
sfIntRect_Intersects
|
||||
sfPostFX_CreateFromFile
|
||||
sfPostFX_CreateFromMemory
|
||||
sfPostFX_Destroy
|
||||
sfPostFX_SetParameter1
|
||||
sfPostFX_SetParameter2
|
||||
sfPostFX_SetParameter3
|
||||
sfPostFX_SetParameter4
|
||||
sfPostFX_SetTexture
|
||||
sfPostFX_CanUsePostFX
|
||||
sfShader_CreateFromFile
|
||||
sfShader_CreateFromMemory
|
||||
sfShader_Destroy
|
||||
sfShader_SetParameter1
|
||||
sfShader_SetParameter2
|
||||
sfShader_SetParameter3
|
||||
sfShader_SetParameter4
|
||||
sfShader_SetTexture
|
||||
sfShader_Bind
|
||||
sfShader_Unbind
|
||||
sfShader_IsAvailable
|
||||
sfShape_Create
|
||||
sfShape_CreateLine
|
||||
sfShape_CreateRectangle
|
||||
|
|
@ -173,10 +175,12 @@ EXPORTS
|
|||
sfRenderImage_SetActive
|
||||
sfRenderImage_Flush
|
||||
sfRenderImage_Display
|
||||
sfRenderImage_DrawPostFX
|
||||
sfRenderImage_DrawSprite
|
||||
sfRenderImage_DrawShape
|
||||
sfRenderImage_DrawString
|
||||
sfRenderImage_DrawSpriteWithShader
|
||||
sfRenderImage_DrawShapeWithShader
|
||||
sfRenderImage_DrawStringWithShader
|
||||
sfRenderImage_Clear
|
||||
sfRenderImage_SetView
|
||||
sfRenderImage_GetView
|
||||
|
|
@ -184,7 +188,7 @@ EXPORTS
|
|||
sfRenderImage_GetViewport
|
||||
sfRenderImage_ConvertCoords
|
||||
sfRenderImage_GetImage
|
||||
sfRenderImage_CanUseRenderImage
|
||||
sfRenderImage_IsAvailable
|
||||
sfRenderWindow_Create
|
||||
sfRenderWindow_CreateFromHandle
|
||||
sfRenderWindow_Destroy
|
||||
|
|
@ -210,10 +214,12 @@ EXPORTS
|
|||
sfRenderWindow_SetFramerateLimit
|
||||
sfRenderWindow_GetFrameTime
|
||||
sfRenderWindow_SetJoystickThreshold
|
||||
sfRenderWindow_DrawPostFX
|
||||
sfRenderWindow_DrawSprite
|
||||
sfRenderWindow_DrawString
|
||||
sfRenderWindow_DrawShape
|
||||
sfRenderWindow_DrawSpriteWithShader
|
||||
sfRenderWindow_DrawStringWithShader
|
||||
sfRenderWindow_DrawShapeWithShader
|
||||
sfRenderWindow_Clear
|
||||
sfRenderWindow_SetView
|
||||
sfRenderWindow_GetView
|
||||
Loading…
Add table
Add a link
Reference in a new issue