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
@ -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>
|
||||
|
||||
@ -113,14 +113,25 @@ 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 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
|
||||
|
||||
@ -293,14 +293,25 @@ 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 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
|
||||
@ -12,7 +12,7 @@
|
||||
<Project filename="..\..\samples\build\codeblocks\pong.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\qt.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\wxwidgets.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\postfx.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\shader.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\sockets.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\sound.cbp" />
|
||||
<Project filename="..\..\samples\build\codeblocks\sound-capture.cbp" />
|
||||
|
||||
@ -8,8 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-audio", "sfml-audio.vc
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-graphics", "sfml-graphics.vcproj", "{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-main", "sfml-main.vcproj", "{2BD26A09-E1B6-42E2-A0D0-63987B76BB97}"
|
||||
@ -25,18 +25,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-window", "sfml-window.
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl", "..\..\samples\build\vc2005\opengl.vcproj", "{4CD9A872-16EF-4C53-81FC-C7E77E782718}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "postfx", "..\..\samples\build\vc2005\postfx.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\samples\build\vc2005\sockets.vcproj", "{E6ED898F-218E-4467-8B1D-92E393283E1B}"
|
||||
@ -46,58 +38,58 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\samples\bu
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "..\..\samples\build\vc2005\sound.vcproj", "{11E3764D-850E-4EDA-9823-F66383A11042}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound-capture", "..\..\samples\build\vc2005\sound-capture.vcproj", "{34EBDA13-AFA3-4AD9-AB64-2B2D40E09573}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "voip", "..\..\samples\build\vc2005\voip.vcproj", "{4B169017-FFDD-4588-9658-6F1C9ABC6495}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32", "..\..\samples\build\vc2005\win32.vcproj", "{303EC049-639D-4F9C-9F33-D4B7F702275B}"
|
||||
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}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "window", "..\..\samples\build\vc2005\window.vcproj", "{11E9ABEF-17A5-4FF7-91E5-994F34172F68}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxwidgets", "..\..\samples\build\vc2005\wxwidgets.vcproj", "{8B3B274A-B3B7-4C6B-8D4A-5334E2116830}"
|
||||
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}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qt", "..\..\samples\build\vc2005\qt.vcproj", "{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{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
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pong", "..\..\samples\build\vc2005\pong.vcproj", "{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}"
|
||||
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}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{C6D36691-1669-4189-AAB8-06C9932C2A45}"
|
||||
@ -106,8 +98,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3EE1
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp", "..\..\samples\build\vc2005\ftp.vcproj", "{7236920B-254C-43A3-9DC1-778B477226DF}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader", "..\..\samples\build\vc2005\shader.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{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
|
||||
@ -204,18 +204,6 @@ Global
|
||||
{4CD9A872-16EF-4C53-81FC-C7E77E782718}.Release static|Win32.Build.0 = Release|Win32
|
||||
{4CD9A872-16EF-4C53-81FC-C7E77E782718}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{4CD9A872-16EF-4C53-81FC-C7E77E782718}.Release|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.Build.0 = Release|Win32
|
||||
{E6ED898F-218E-4467-8B1D-92E393283E1B}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{E6ED898F-218E-4467-8B1D-92E393283E1B}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{E6ED898F-218E-4467-8B1D-92E393283E1B}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
@ -336,6 +324,18 @@ Global
|
||||
{7236920B-254C-43A3-9DC1-778B477226DF}.Release static|Win32.Build.0 = Release|Win32
|
||||
{7236920B-254C-43A3-9DC1-778B477226DF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7236920B-254C-43A3-9DC1-778B477226DF}.Release|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@ -347,7 +347,6 @@ Global
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C6D36691-1669-4189-AAB8-06C9932C2A45}
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {C6D36691-1669-4189-AAB8-06C9932C2A45}
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {C6D36691-1669-4189-AAB8-06C9932C2A45}
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{E6ED898F-218E-4467-8B1D-92E393283E1B} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{11E3764D-850E-4EDA-9823-F66383A11042} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{34EBDA13-AFA3-4AD9-AB64-2B2D40E09573} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
@ -359,5 +358,6 @@ Global
|
||||
{DDDE27DC-5568-43EE-BD0E-57C581F73EDE} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{4CD9A872-16EF-4C53-81FC-C7E77E782718} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{7236920B-254C-43A3-9DC1-778B477226DF} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D} = {3EE136A0-C638-4989-BE5A-E4007221CA28}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -3514,14 +3514,6 @@
|
||||
RelativePath="..\..\include\SFML\Graphics\Matrix3.inl"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\PostFX.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\Rect.hpp"
|
||||
>
|
||||
@ -3546,6 +3538,14 @@
|
||||
RelativePath="..\..\include\SFML\Graphics\RenderWindow.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\Shader.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\View.cpp"
|
||||
>
|
||||
|
||||
@ -45,14 +45,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pong", "..\..\samples\build
|
||||
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "postfx", "..\..\samples\build\vc2008\postfx.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{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
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qt", "..\..\samples\build\vc2008\qt.vcproj", "{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
|
||||
@ -111,6 +103,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{8A8AFD7B-4
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{BF8295B9-DE13-4CF5-A71F-A345BCA50D68}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader", "..\..\samples\build\vc2008\shader.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
|
||||
{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
|
||||
@ -229,18 +229,6 @@ Global
|
||||
{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}.Release static|Win32.Build.0 = Release|Win32
|
||||
{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}.Release|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.Build.0 = Release|Win32
|
||||
{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
@ -337,6 +325,18 @@ Global
|
||||
{8B3B274A-B3B7-4C6B-8D4A-5334E2116830}.Release static|Win32.Build.0 = Release|Win32
|
||||
{8B3B274A-B3B7-4C6B-8D4A-5334E2116830}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8B3B274A-B3B7-4C6B-8D4A-5334E2116830}.Release|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug DLL|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug static|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release DLL|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release static|Win32.Build.0 = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@ -350,7 +350,6 @@ Global
|
||||
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {8A8AFD7B-453B-40BE-9C46-A5748C1ABA45}
|
||||
{4CD9A872-16EF-4C53-81FC-C7E77E782718} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{DDDE27DC-5568-43EE-BD0E-57C581F73EDE} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{EAB1A0A4-8CCC-4A74-B3B5-9F60243581D2} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{E6ED898F-218E-4467-8B1D-92E393283E1B} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{11E3764D-850E-4EDA-9823-F66383A11042} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
@ -360,5 +359,6 @@ Global
|
||||
{11E9ABEF-17A5-4FF7-91E5-994F34172F68} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{8B3B274A-B3B7-4C6B-8D4A-5334E2116830} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{7236920B-254C-43A3-9DC1-778B477226DF} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
{E8B7727D-2308-4ADC-90AE-D3F46798447D} = {BF8295B9-DE13-4CF5-A71F-A345BCA50D68}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -3392,14 +3392,6 @@
|
||||
RelativePath="..\..\include\SFML\Graphics\Drawable.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\PostFX.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
|
||||
>
|
||||
@ -3545,6 +3537,14 @@
|
||||
RelativePath="..\..\include\SFML\Graphics\RenderWindow.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\Shader.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SFML\Graphics\Shader.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SFML\Graphics\View.cpp"
|
||||
>
|
||||
|
||||
@ -11,12 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-opengl", "..\..\samp
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-window", "..\..\samples\window\sample-window.csproj", "{C1FBB9AF-B69A-4D06-9BDC-EAC7606296FF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-postfx", "..\..\samples\post-fx\sample-postfx.csproj", "{9D4738F7-34EA-433A-A765-AF85A52A174D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-sound", "..\..\samples\sound\sample-sound.csproj", "{16E177F3-A0FF-4091-8521-562E0EBAA3AB}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-soundcapture", "..\..\samples\sound_capture\sample-soundcapture.csproj", "{F2F48990-F81E-41BA-AD01-168F6178C807}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample-shader", "..\..\samples\shader\sample-shader.csproj", "{9D4738F7-34EA-433A-A765-AF85A52A174D}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -43,10 +43,6 @@ Global
|
||||
{C1FBB9AF-B69A-4D06-9BDC-EAC7606296FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C1FBB9AF-B69A-4D06-9BDC-EAC7606296FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C1FBB9AF-B69A-4D06-9BDC-EAC7606296FF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{16E177F3-A0FF-4091-8521-562E0EBAA3AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{16E177F3-A0FF-4091-8521-562E0EBAA3AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{16E177F3-A0FF-4091-8521-562E0EBAA3AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
@ -55,6 +51,10 @@ Global
|
||||
{F2F48990-F81E-41BA-AD01-168F6178C807}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F2F48990-F81E-41BA-AD01-168F6178C807}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F2F48990-F81E-41BA-AD01-168F6178C807}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9D4738F7-34EA-433A-A765-AF85A52A174D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,16 +0,0 @@
|
||||
texture framebuffer
|
||||
float offset
|
||||
|
||||
effect
|
||||
{
|
||||
vec2 offx = vec2(offset, 0.0);
|
||||
vec2 offy = vec2(0.0, offset);
|
||||
|
||||
vec4 c0 = framebuffer(_in);
|
||||
vec4 c1 = framebuffer(_in - offy);
|
||||
vec4 c2 = framebuffer(_in + offy);
|
||||
vec4 c3 = framebuffer(_in - offx);
|
||||
vec4 c4 = framebuffer(_in + offx);
|
||||
|
||||
_out = c0 * 0.2 + c1 * 0.2 + c2 * 0.2 + c3 * 0.2 + c4 * 0.2;
|
||||
}
|
||||
Binary file not shown.
@ -1,10 +0,0 @@
|
||||
texture framebuffer
|
||||
vec3 color
|
||||
|
||||
effect
|
||||
{
|
||||
vec4 pixel = framebuffer(_in);
|
||||
float gray = pixel.r * 0.39 + pixel.g * 0.50 + pixel.b * 0.11;
|
||||
|
||||
_out = vec4(gray * color, 1.0) * 0.6 + pixel * 0.4;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
texture framebuffer
|
||||
vec2 mouse
|
||||
|
||||
effect
|
||||
{
|
||||
float len = distance(_in, mouse) * 7.0;
|
||||
|
||||
if (len < 1.0)
|
||||
_out = framebuffer(_in + (_in - mouse) * len);
|
||||
else
|
||||
_out = framebuffer(_in);
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
texture framebuffer
|
||||
|
||||
effect
|
||||
{
|
||||
_out = framebuffer(_in);
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
texture framebuffer
|
||||
vec2 mouse
|
||||
|
||||
effect
|
||||
{
|
||||
float factor = 5 + 100 * length(mouse);
|
||||
|
||||
vec2 pos = floor(_in * factor) / factor;
|
||||
|
||||
_out = framebuffer(pos);
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
texture framebuffer
|
||||
texture wave
|
||||
vec2 offset
|
||||
|
||||
effect
|
||||
{
|
||||
vec2 texoffset = wave(_in * offset).xy;
|
||||
texoffset -= vec2(0.5, 0.5);
|
||||
texoffset *= 0.05;
|
||||
|
||||
_out = framebuffer(_in + texoffset);
|
||||
}
|
||||
BIN
dotnet/samples/bin/datas/shader/arial.ttf
Normal file
BIN
dotnet/samples/bin/datas/shader/arial.ttf
Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
16
dotnet/samples/bin/datas/shader/blur.sfx
Normal file
16
dotnet/samples/bin/datas/shader/blur.sfx
Normal file
@ -0,0 +1,16 @@
|
||||
uniform sampler2D texture;
|
||||
uniform float offset;
|
||||
|
||||
void main()
|
||||
{
|
||||
vec2 offx = vec2(offset, 0.0);
|
||||
vec2 offy = vec2(0.0, offset);
|
||||
|
||||
vec4 c0 = texture2D(texture, gl_TexCoord[0].xy);
|
||||
vec4 c1 = texture2D(texture, gl_TexCoord[0].xy - offy);
|
||||
vec4 c2 = texture2D(texture, gl_TexCoord[0].xy + offy);
|
||||
vec4 c3 = texture2D(texture, gl_TexCoord[0].xy - offx);
|
||||
vec4 c4 = texture2D(texture, gl_TexCoord[0].xy + offx);
|
||||
|
||||
gl_FragColor = gl_Color * (c0 * 0.2 + c1 * 0.2 + c2 * 0.2 + c3 * 0.2 + c4 * 0.2);
|
||||
}
|
||||
11
dotnet/samples/bin/datas/shader/colorize.sfx
Normal file
11
dotnet/samples/bin/datas/shader/colorize.sfx
Normal file
@ -0,0 +1,11 @@
|
||||
uniform sampler2D texture;
|
||||
uniform vec3 color;
|
||||
|
||||
void main()
|
||||
{
|
||||
vec4 pixel = texture2D(texture, gl_TexCoord[0].xy) * gl_Color;
|
||||
float gray = pixel.r * 0.39 + pixel.g * 0.50 + pixel.b * 0.11;
|
||||
|
||||
gl_FragColor = vec4(gray * color, 1.0) * 0.6 + pixel * 0.4;
|
||||
gl_FragColor.a = pixel.a;
|
||||
}
|
||||
13
dotnet/samples/bin/datas/shader/fisheye.sfx
Normal file
13
dotnet/samples/bin/datas/shader/fisheye.sfx
Normal file
@ -0,0 +1,13 @@
|
||||
uniform sampler2D texture;
|
||||
uniform vec2 mouse;
|
||||
|
||||
void main()
|
||||
{
|
||||
float len = distance(gl_TexCoord[0].xy, mouse) * 7.0;
|
||||
|
||||
vec2 coords = gl_TexCoord[0].xy;
|
||||
if (len < 1.0)
|
||||
coords += (gl_TexCoord[0].xy - mouse) * len;
|
||||
|
||||
gl_FragColor = texture2D(texture, coords) * gl_Color;
|
||||
}
|
||||
6
dotnet/samples/bin/datas/shader/nothing.sfx
Normal file
6
dotnet/samples/bin/datas/shader/nothing.sfx
Normal file
@ -0,0 +1,6 @@
|
||||
uniform sampler2D texture;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_FragColor = texture2D(texture, gl_TexCoord[0].xy) * gl_Color;
|
||||
}
|
||||
10
dotnet/samples/bin/datas/shader/pixelate.sfx
Normal file
10
dotnet/samples/bin/datas/shader/pixelate.sfx
Normal file
@ -0,0 +1,10 @@
|
||||
uniform sampler2D texture;
|
||||
uniform vec2 mouse;
|
||||
|
||||
void main()
|
||||
{
|
||||
float factor = 5 + 100 * length(mouse);
|
||||
vec2 pos = floor(gl_TexCoord[0].xy * factor + 0.5) / factor;
|
||||
|
||||
gl_FragColor = texture2D(texture, pos) * gl_Color;
|
||||
}
|
||||
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
12
dotnet/samples/bin/datas/shader/wave.sfx
Normal file
12
dotnet/samples/bin/datas/shader/wave.sfx
Normal file
@ -0,0 +1,12 @@
|
||||
uniform sampler2D texture;
|
||||
uniform sampler2D wave;
|
||||
uniform vec2 offset;
|
||||
|
||||
void main()
|
||||
{
|
||||
vec2 texoffset = texture2D(wave, (gl_TexCoord[0].xy * offset).xy);
|
||||
texoffset -= vec2(0.5, 0.5);
|
||||
texoffset *= 0.05;
|
||||
|
||||
gl_FragColor = texture2D(texture, gl_TexCoord[0].xy + texoffset) * gl_Color;
|
||||
}
|
||||
@ -1,184 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using SFML;
|
||||
using SFML.Graphics;
|
||||
using SFML.Window;
|
||||
|
||||
namespace sample_postfx
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
private static Dictionary<string, PostFx> effects;
|
||||
private static Dictionary<string, PostFx>.Enumerator currentEffect;
|
||||
private static String2D curFXStr;
|
||||
|
||||
/// <summary>
|
||||
/// The main entry point for the application.
|
||||
/// </summary>
|
||||
static void Main()
|
||||
{
|
||||
// Create the main window
|
||||
RenderWindow window = new RenderWindow(new VideoMode(800, 600), "SFML.Net PostFX");
|
||||
|
||||
// Setup event handlers
|
||||
window.Closed += new EventHandler(OnClosed);
|
||||
window.KeyPressed += new EventHandler<KeyEventArgs>(OnKeyPressed);
|
||||
|
||||
// Check that the system can use post effects
|
||||
if (PostFx.CanUsePostFX == false)
|
||||
{
|
||||
DisplayError(window);
|
||||
return;
|
||||
}
|
||||
|
||||
// Load a background image to display
|
||||
Sprite background = new Sprite(new Image("datas/post-fx/background.jpg"));
|
||||
|
||||
// Load a sprite which we'll move into the scene
|
||||
Sprite entity = new Sprite(new Image("datas/post-fx/sprite.png"));
|
||||
|
||||
// Load the text font
|
||||
Font cheeseburger = new Font("datas/post-fx/cheeseburger.ttf");
|
||||
|
||||
// Load the image needed for the wave effect
|
||||
Image waveImage = new Image("datas/post-fx/wave.jpg");
|
||||
|
||||
// Load all effects
|
||||
effects = new Dictionary<string, PostFx>();
|
||||
effects["nothing"] = new PostFx("datas/post-fx/nothing.sfx");
|
||||
effects["blur"] = new PostFx("datas/post-fx/blur.sfx");
|
||||
effects["colorize"] = new PostFx("datas/post-fx/colorize.sfx");
|
||||
effects["fisheye"] = new PostFx("datas/post-fx/fisheye.sfx");
|
||||
effects["wave"] = new PostFx("datas/post-fx/wave.sfx");
|
||||
effects["pixelate"] = new PostFx("datas/post-fx/pixelate.sfx");
|
||||
currentEffect = effects.GetEnumerator();
|
||||
currentEffect.MoveNext();
|
||||
|
||||
// Do specific initializations
|
||||
effects["nothing"].SetTexture("framebuffer", null);
|
||||
effects["blur"].SetTexture("framebuffer", null);
|
||||
effects["blur"].SetParameter("offset", 0.0F);
|
||||
effects["colorize"].SetTexture("framebuffer", null);
|
||||
effects["colorize"].SetParameter("color", 1.0F, 1.0F, 1.0F);
|
||||
effects["fisheye"].SetTexture("framebuffer", null);
|
||||
effects["wave"].SetTexture("framebuffer", null);
|
||||
effects["wave"].SetTexture("wave", waveImage);
|
||||
effects["pixelate"].SetTexture("framebuffer", null);
|
||||
|
||||
// Define a string for displaying current effect description
|
||||
curFXStr = new String2D();
|
||||
curFXStr.Text = "Current effect is \"" + currentEffect.Current.Key + "\"";
|
||||
curFXStr.Font = cheeseburger;
|
||||
curFXStr.Position = new Vector2(20.0F, 0.0F);
|
||||
curFXStr.Color = new Color(150, 70, 110);
|
||||
|
||||
// Define a string for displaying help
|
||||
String2D infoStr = new String2D();
|
||||
infoStr.Text = "Move your mouse to change the effect parameters\nPress numpad + to change effect\nWarning : some effects may not work\ndepending on your graphics card";
|
||||
infoStr.Font = cheeseburger;
|
||||
infoStr.Position = new Vector2(20.0F, 460.0F);
|
||||
infoStr.Color = new Color(200, 100, 150);
|
||||
|
||||
// Start the game loop
|
||||
float time = 0.0F;
|
||||
while (window.IsOpened())
|
||||
{
|
||||
// Process events
|
||||
window.DispatchEvents();
|
||||
|
||||
// Get the mouse position in the range [0, 1]
|
||||
float x = window.Input.GetMouseX() / (float)window.Width;
|
||||
float y = window.Input.GetMouseY() / (float)window.Height;
|
||||
|
||||
// Update the current effect
|
||||
if (currentEffect.Current.Key == "blur") currentEffect.Current.Value.SetParameter("offset", x * y * 0.1f);
|
||||
else if (currentEffect.Current.Key == "colorize") currentEffect.Current.Value.SetParameter("color", 0.3f, x, y);
|
||||
else if (currentEffect.Current.Key == "fisheye") currentEffect.Current.Value.SetParameter("mouse", x, 1.0F - y);
|
||||
else if (currentEffect.Current.Key == "wave") currentEffect.Current.Value.SetParameter("offset", x, y);
|
||||
else if (currentEffect.Current.Key == "pixelate") currentEffect.Current.Value.SetParameter("mouse", x, y);
|
||||
|
||||
// Animate the sprite
|
||||
time += window.GetFrameTime();
|
||||
float entityX = (float)(Math.Cos(time * 1.3) + 1.2) * 300;
|
||||
float entityY = (float)(Math.Cos(time * 0.8) + 1.2) * 200;
|
||||
entity.Position = new Vector2(entityX, entityY);
|
||||
entity.Rotation = time * 100;
|
||||
|
||||
// Clear the window
|
||||
window.Clear();
|
||||
|
||||
// Draw background, the sprite and apply the post-fx
|
||||
window.Draw(background);
|
||||
window.Draw(entity);
|
||||
window.Draw(currentEffect.Current.Value);
|
||||
|
||||
// Draw interface strings
|
||||
window.Draw(curFXStr);
|
||||
window.Draw(infoStr);
|
||||
|
||||
// Finally, display the rendered frame on screen
|
||||
window.Display();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fonction called when the post-effects are not supported ;
|
||||
/// Display an error message and wait until the user exits
|
||||
/// </summary>
|
||||
private static void DisplayError(RenderWindow window)
|
||||
{
|
||||
// Define a string for displaying the error message
|
||||
String2D errorStr = new String2D("Sorry, your system doesn't support post-effects");
|
||||
errorStr.Position = new Vector2(100.0F, 250.0F);
|
||||
errorStr.Color = new Color(200, 100, 150);
|
||||
|
||||
// Start the game loop
|
||||
while (window.IsOpened())
|
||||
{
|
||||
// Process events
|
||||
window.DispatchEvents();
|
||||
|
||||
// Clear the window
|
||||
window.Clear();
|
||||
|
||||
// Draw the error message
|
||||
window.Draw(errorStr);
|
||||
|
||||
// Finally, display the rendered frame on screen
|
||||
window.Display();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Function called when the window is closed
|
||||
/// </summary>
|
||||
static void OnClosed(object sender, EventArgs e)
|
||||
{
|
||||
RenderWindow window = (RenderWindow)sender;
|
||||
window.Close();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Function called when a key is pressed
|
||||
/// </summary>
|
||||
static void OnKeyPressed(object sender, KeyEventArgs e)
|
||||
{
|
||||
RenderWindow window = (RenderWindow)sender;
|
||||
if (e.Code == KeyCode.Escape)
|
||||
{
|
||||
// Close the window
|
||||
window.Close();
|
||||
}
|
||||
else if (e.Code == KeyCode.Add)
|
||||
{
|
||||
// Advance to the next effect
|
||||
if (currentEffect.MoveNext() == false)
|
||||
{
|
||||
currentEffect = effects.GetEnumerator();
|
||||
currentEffect.MoveNext();
|
||||
}
|
||||
curFXStr.Text = "Current effect is \"" + currentEffect.Current.Key + "\"";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
249
dotnet/samples/shader/Shader.cs
Normal file
249
dotnet/samples/shader/Shader.cs
Normal file
@ -0,0 +1,249 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using SFML;
|
||||
using SFML.Graphics;
|
||||
using SFML.Window;
|
||||
|
||||
namespace sample_shader
|
||||
{
|
||||
/// <summary>
|
||||
/// A class to simplify shader selection
|
||||
/// </summary>
|
||||
class ShaderSelector
|
||||
{
|
||||
// Constructor
|
||||
public ShaderSelector(Dictionary<string, Shader> owner)
|
||||
{
|
||||
myOwner = owner;
|
||||
myIterator = owner.GetEnumerator();
|
||||
myIterator.MoveNext();
|
||||
}
|
||||
|
||||
// Select the next shader
|
||||
public void GotoNext()
|
||||
{
|
||||
if (myIterator.MoveNext() == false)
|
||||
{
|
||||
myIterator = myOwner.GetEnumerator();
|
||||
myIterator.MoveNext();
|
||||
}
|
||||
}
|
||||
|
||||
// Update the shader parameters
|
||||
public void Update(float x, float y)
|
||||
{
|
||||
if (myIterator.Current.Key == "blur") myIterator.Current.Value.SetParameter("offset", x * y * 0.05f);
|
||||
else if (myIterator.Current.Key == "colorize") myIterator.Current.Value.SetParameter("color", 0.3f, x, y);
|
||||
else if (myIterator.Current.Key == "fisheye") myIterator.Current.Value.SetParameter("mouse", x, y);
|
||||
else if (myIterator.Current.Key == "wave") myIterator.Current.Value.SetParameter("offset", x, y);
|
||||
else if (myIterator.Current.Key == "pixelate") myIterator.Current.Value.SetParameter("mouse", x, y);
|
||||
}
|
||||
|
||||
// Get the name of the current shader
|
||||
public string Name
|
||||
{
|
||||
get {return myIterator.Current.Key;}
|
||||
}
|
||||
|
||||
// Get the current shader
|
||||
public Shader Shader
|
||||
{
|
||||
get {return myIterator.Current.Value;}
|
||||
}
|
||||
|
||||
private Dictionary<string, Shader> myOwner;
|
||||
private Dictionary<string, Shader>.Enumerator myIterator;
|
||||
};
|
||||
|
||||
static class Program
|
||||
{
|
||||
private static Dictionary<string, Shader> shaders;
|
||||
private static ShaderSelector backgroundShader;
|
||||
private static ShaderSelector entityShader;
|
||||
private static ShaderSelector globalShader;
|
||||
private static String2D shaderStr;
|
||||
|
||||
/// <summary>
|
||||
/// The main entry point for the application.
|
||||
/// </summary>
|
||||
static void Main()
|
||||
{
|
||||
// Create the main window
|
||||
RenderWindow window = new RenderWindow(new VideoMode(800, 600), "SFML.Net Shader");
|
||||
|
||||
// Setup event handlers
|
||||
window.Closed += new EventHandler(OnClosed);
|
||||
window.KeyPressed += new EventHandler<KeyEventArgs>(OnKeyPressed);
|
||||
|
||||
// Check that the system can use shaders
|
||||
if (Shader.IsAvailable == false)
|
||||
{
|
||||
DisplayError(window);
|
||||
return;
|
||||
}
|
||||
|
||||
// Create the render image
|
||||
RenderImage image = new RenderImage(window.Width, window.Height);
|
||||
|
||||
// Load a background image to display
|
||||
Sprite background = new Sprite(new Image("datas/shader/background.jpg"));
|
||||
background.Image.Smooth = false;
|
||||
|
||||
// Load a sprite which we'll move into the scene
|
||||
Sprite entity = new Sprite(new Image("datas/shader/sprite.png"));
|
||||
|
||||
// Load the text font
|
||||
Font font = new Font("datas/shader/arial.ttf", 20);
|
||||
|
||||
// Load the image needed for the wave effect
|
||||
Image waveImage = new Image("datas/shader/wave.jpg");
|
||||
|
||||
// Load all effects
|
||||
shaders = new Dictionary<string, Shader>();
|
||||
shaders["nothing"] = new Shader("datas/shader/nothing.sfx");
|
||||
shaders["blur"] = new Shader("datas/shader/blur.sfx");
|
||||
shaders["colorize"] = new Shader("datas/shader/colorize.sfx");
|
||||
shaders["fisheye"] = new Shader("datas/shader/fisheye.sfx");
|
||||
shaders["wave"] = new Shader("datas/shader/wave.sfx");
|
||||
shaders["pixelate"] = new Shader("datas/shader/pixelate.sfx");
|
||||
backgroundShader = new ShaderSelector(shaders);
|
||||
entityShader = new ShaderSelector(shaders);
|
||||
globalShader = new ShaderSelector(shaders);
|
||||
|
||||
// Do specific initializations
|
||||
shaders["nothing"].SetTexture("texture", Shader.CurrentTexture);
|
||||
shaders["blur"].SetTexture("texture", Shader.CurrentTexture);
|
||||
shaders["blur"].SetParameter("offset", 0.0F);
|
||||
shaders["colorize"].SetTexture("texture", Shader.CurrentTexture);
|
||||
shaders["colorize"].SetParameter("color", 1.0F, 1.0F, 1.0F);
|
||||
shaders["fisheye"].SetTexture("texture", Shader.CurrentTexture);
|
||||
shaders["wave"].SetTexture("texture", Shader.CurrentTexture);
|
||||
shaders["wave"].SetTexture("wave", waveImage);
|
||||
shaders["pixelate"].SetTexture("texture", Shader.CurrentTexture);
|
||||
|
||||
// Define a string for displaying current effect description
|
||||
shaderStr = new String2D();
|
||||
shaderStr.Font = font;
|
||||
shaderStr.Size = 20;
|
||||
shaderStr.Position = new Vector2(5.0F, 0.0F);
|
||||
shaderStr.Color = new Color(250, 100, 30);
|
||||
shaderStr.Text = "Background shader: \"" + backgroundShader.Name + "\"\n" +
|
||||
"Flower shader: \"" + entityShader.Name + "\"\n" +
|
||||
"Global shader: \"" + globalShader.Name + "\"\n";
|
||||
|
||||
// Define a string for displaying help
|
||||
String2D infoStr = new String2D();
|
||||
infoStr.Font = font;
|
||||
infoStr.Size = 20;
|
||||
infoStr.Position = new Vector2(5.0F, 510.0F);
|
||||
infoStr.Color = new Color(250, 100, 30);
|
||||
infoStr.Text = "Move your mouse to change the shaders' parameters\n" +
|
||||
"Press numpad 1 to change the background shader\n" +
|
||||
"Press numpad 2 to change the flower shader\n" +
|
||||
"Press numpad 3 to change the global shader";
|
||||
|
||||
// Start the game loop
|
||||
float time = 0.0F;
|
||||
while (window.IsOpened())
|
||||
{
|
||||
// Process events
|
||||
window.DispatchEvents();
|
||||
|
||||
// Get the mouse position in the range [0, 1]
|
||||
//float x = window.Input.GetMouseX() / (float)window.Width;
|
||||
//float y = window.Input.GetMouseY() / (float)window.Height;
|
||||
float x = (float)(Math.Cos(time * 1.3) + 1) * 0.5F;
|
||||
float y = (float)(Math.Sin(time * 0.8) + 1) * 0.5F;
|
||||
|
||||
// Update the shaders
|
||||
backgroundShader.Update(x, y);
|
||||
entityShader.Update(x, y);
|
||||
globalShader.Update(x, y);
|
||||
|
||||
// Animate the sprite
|
||||
time += window.GetFrameTime();
|
||||
float entityX = (float)(Math.Cos(time * 1.3) + 1.2) * 300;
|
||||
float entityY = (float)(Math.Cos(time * 0.8) + 1.2) * 200;
|
||||
entity.Position = new Vector2(entityX, entityY);
|
||||
entity.Rotation = time * 100;
|
||||
|
||||
// Draw the background and the moving entity to the render image
|
||||
image.Draw(background, backgroundShader.Shader);
|
||||
image.Draw(entity, entityShader.Shader);
|
||||
image.Display();
|
||||
|
||||
// Draw the contents of the render image to the window
|
||||
window.Draw(new Sprite(image.Image), globalShader.Shader);
|
||||
|
||||
// Draw interface strings
|
||||
window.Draw(shaderStr);
|
||||
window.Draw(infoStr);
|
||||
|
||||
// Finally, display the rendered frame on screen
|
||||
window.Display();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fonction called when the post-effects are not supported ;
|
||||
/// Display an error message and wait until the user exits
|
||||
/// </summary>
|
||||
private static void DisplayError(RenderWindow window)
|
||||
{
|
||||
// Define a string for displaying the error message
|
||||
String2D errorStr = new String2D("Sorry, your system doesn't support shaders");
|
||||
errorStr.Position = new Vector2(100.0F, 250.0F);
|
||||
errorStr.Color = new Color(200, 100, 150);
|
||||
|
||||
// Start the game loop
|
||||
while (window.IsOpened())
|
||||
{
|
||||
// Process events
|
||||
window.DispatchEvents();
|
||||
|
||||
// Clear the window
|
||||
window.Clear();
|
||||
|
||||
// Draw the error message
|
||||
window.Draw(errorStr);
|
||||
|
||||
// Finally, display the rendered frame on screen
|
||||
window.Display();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Function called when the window is closed
|
||||
/// </summary>
|
||||
static void OnClosed(object sender, EventArgs e)
|
||||
{
|
||||
RenderWindow window = (RenderWindow)sender;
|
||||
window.Close();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Function called when a key is pressed
|
||||
/// </summary>
|
||||
static void OnKeyPressed(object sender, KeyEventArgs e)
|
||||
{
|
||||
RenderWindow window = (RenderWindow)sender;
|
||||
|
||||
// Escape key : exit
|
||||
if (e.Code == KeyCode.Escape)
|
||||
window.Close();
|
||||
|
||||
// Numpad : switch effect
|
||||
switch (e.Code)
|
||||
{
|
||||
case KeyCode.Numpad1 : backgroundShader.GotoNext(); break;
|
||||
case KeyCode.Numpad2 : entityShader.GotoNext(); break;
|
||||
case KeyCode.Numpad3 : globalShader.GotoNext(); break;
|
||||
}
|
||||
|
||||
// Update the text
|
||||
shaderStr.Text = "Background shader: \"" + backgroundShader.Name + "\"\n" +
|
||||
"Flower shader: \"" + entityShader.Name + "\"\n" +
|
||||
"Global shader: \"" + globalShader.Name + "\"\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -7,13 +7,14 @@
|
||||
<ProjectGuid>{9D4738F7-34EA-433A-A765-AF85A52A174D}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>sample_postfx</RootNamespace>
|
||||
<AssemblyName>post-fx</AssemblyName>
|
||||
<RootNamespace>sample_shader</RootNamespace>
|
||||
<AssemblyName>shader</AssemblyName>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<StartupObject>sample_shader.Program</StartupObject>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@ -43,7 +44,7 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="PostFx.cs" />
|
||||
<Compile Include="Shader.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
@ -13,7 +13,7 @@ namespace sample_soundcapture
|
||||
static void Main(string[] args)
|
||||
{
|
||||
// Check that the device can capture audio
|
||||
if (SoundRecorder.CanCapture == false)
|
||||
if (SoundRecorder.IsAvailable == false)
|
||||
{
|
||||
Console.WriteLine("Sorry, audio capture is not supported by your system");
|
||||
return;
|
||||
|
||||
@ -78,9 +78,9 @@ namespace SFML
|
||||
/// If not, this class won't be usable
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public static bool CanCapture
|
||||
public static bool IsAvailable
|
||||
{
|
||||
get {return sfSoundRecorder_CanCapture();}
|
||||
get {return sfSoundRecorder_IsAvailable();}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -173,7 +173,7 @@ namespace SFML
|
||||
static extern uint sfSoundRecorder_GetSampleRate(IntPtr SoundRecorder);
|
||||
|
||||
[DllImport("csfml-audio"), SuppressUnmanagedCodeSecurity]
|
||||
static extern bool sfSoundRecorder_CanCapture();
|
||||
static extern bool sfSoundRecorder_IsAvailable();
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -101,16 +101,18 @@ namespace SFML
|
||||
/// Render the object into the given render window
|
||||
/// </summary>
|
||||
/// <param name="target">Target render window</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal abstract void Render(RenderWindow target);
|
||||
internal abstract void Render(RenderWindow target, Shader shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Render the object into the given render image
|
||||
/// </summary>
|
||||
/// <param name="target">Target render image</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal abstract void Render(RenderImage target);
|
||||
internal abstract void Render(RenderImage target, Shader shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
|
||||
@ -36,14 +36,14 @@ namespace SFML
|
||||
/// </summary>
|
||||
/// <param name="width">Width of the render image</param>
|
||||
/// <param name="height">Height of the render image</param>
|
||||
/// <param name="depthBuffer">Do you wxant a depth-buffer attached?</param>
|
||||
/// <param name="depthBuffer">Do you want a depth-buffer attached?</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public RenderImage(uint width, uint height, bool depthBuffer) :
|
||||
base(sfRenderImage_Create(width, height, depthBuffer))
|
||||
{
|
||||
myDefaultView = new View(sfRenderImage_GetDefaultView(This));
|
||||
myCurrentView = myDefaultView;
|
||||
myImage = new Image(sfRenderImage_GetImage(This));
|
||||
myCurrentView = myDefaultView;
|
||||
GC.SuppressFinalize(myDefaultView);
|
||||
GC.SuppressFinalize(myImage);
|
||||
}
|
||||
@ -177,18 +177,19 @@ namespace SFML
|
||||
////////////////////////////////////////////////////////////
|
||||
public void Draw(Drawable objectToDraw)
|
||||
{
|
||||
objectToDraw.Render(this);
|
||||
objectToDraw.Render(this, null);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Apply a post-fx to the render image
|
||||
/// Draw something into the render image with a shader
|
||||
/// </summary>
|
||||
/// <param name="postFx">PostFx to apply</param>
|
||||
/// <param name="objectToDraw">Object to draw</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void Draw(PostFx postFx)
|
||||
public void Draw(Drawable objectToDraw, Shader shader)
|
||||
{
|
||||
sfRenderImage_DrawPostFX(This, postFx != null ? postFx.This : IntPtr.Zero);
|
||||
objectToDraw.Render(this, shader);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -236,9 +237,9 @@ namespace SFML
|
||||
/// Tell whether or not the system supports render images
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public static bool CanUseRenderImage
|
||||
public static bool IsAvailable
|
||||
{
|
||||
get {return sfRenderImage_CanUseRenderImage();}
|
||||
get {return sfRenderImage_IsAvailable();}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -308,14 +309,11 @@ namespace SFML
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_ConvertCoords(IntPtr This, uint WindowX, uint WindowY, out float ViewX, out float ViewY, IntPtr TargetView);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawPostFX(IntPtr This, IntPtr PostFx);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern IntPtr sfRenderImage_GetImage(IntPtr This);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern bool sfRenderImage_CanUseRenderImage();
|
||||
static extern bool sfRenderImage_IsAvailable();
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
@ -99,11 +99,12 @@ namespace SFML
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Apply a post-fx to the window
|
||||
/// Draw something into the render image with a shader
|
||||
/// </summary>
|
||||
/// <param name="postFx">PostFx to apply</param>
|
||||
/// <param name="objectToDraw">Object to draw</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
void Draw(PostFx postFx);
|
||||
void Draw(Drawable objectToDraw, Shader shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
|
||||
@ -390,18 +390,19 @@ namespace SFML
|
||||
////////////////////////////////////////////////////////////
|
||||
public void Draw(Drawable objectToDraw)
|
||||
{
|
||||
objectToDraw.Render(this);
|
||||
objectToDraw.Render(this, null);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Apply a post-fx to the window
|
||||
/// Draw something into the window with a shader
|
||||
/// </summary>
|
||||
/// <param name="postFx">PostFx to apply</param>
|
||||
/// <param name="objectToDraw">Object to draw</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void Draw(PostFx postFx)
|
||||
public void Draw(Drawable objectToDraw, Shader shader)
|
||||
{
|
||||
sfRenderWindow_DrawPostFX(This, postFx != null ? postFx.This : IntPtr.Zero);
|
||||
objectToDraw.Render(this, shader);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -572,9 +573,6 @@ namespace SFML
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_ConvertCoords(IntPtr This, uint WindowX, uint WindowY, out float ViewX, out float ViewY, IntPtr TargetView);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawPostFX(IntPtr This, IntPtr PostFx);
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,97 +9,109 @@ namespace SFML
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// PostFX is used to apply a post effect to a window
|
||||
/// Wrapper for pixel shaders
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public class PostFx : ObjectBase
|
||||
public class Shader : ObjectBase
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Default constructor (invalid effect)
|
||||
/// Default constructor (invalid shader)
|
||||
/// </summary>
|
||||
/// <exception cref="LoadingFailedException" />
|
||||
////////////////////////////////////////////////////////////
|
||||
public PostFx() :
|
||||
base(sfPostFx_Create())
|
||||
public Shader() :
|
||||
base(sfShader_Create())
|
||||
{
|
||||
if (This == IntPtr.Zero)
|
||||
throw new LoadingFailedException("post-fx");
|
||||
throw new LoadingFailedException("shader");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Load the effect from a file
|
||||
/// Load the shader from a file
|
||||
/// </summary>
|
||||
/// <param name="filename">Path of the effect file to load</param>
|
||||
/// <param name="filename">Path of the shader file to load</param>
|
||||
/// <exception cref="LoadingFailedException" />
|
||||
////////////////////////////////////////////////////////////
|
||||
public PostFx(string filename) :
|
||||
base(sfPostFX_CreateFromFile(filename))
|
||||
public Shader(string filename) :
|
||||
base(sfShader_CreateFromFile(filename))
|
||||
{
|
||||
if (This == IntPtr.Zero)
|
||||
throw new LoadingFailedException("post-fx", filename);
|
||||
throw new LoadingFailedException("shader", filename);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Load the effect from a text in memory
|
||||
/// Load the shader from a text in memory
|
||||
/// </summary>
|
||||
/// <param name="effect">String containing the effect code</param>
|
||||
/// <param name="shader">String containing the shader code</param>
|
||||
/// <exception cref="LoadingFailedException" />
|
||||
////////////////////////////////////////////////////////////
|
||||
void LoadFromString(string effect)
|
||||
void LoadFromString(string shader)
|
||||
{
|
||||
SetThis(sfPostFX_CreateFromMemory(effect));
|
||||
SetThis(sfShader_CreateFromMemory(shader));
|
||||
|
||||
if (This == IntPtr.Zero)
|
||||
throw new LoadingFailedException("post-fx");
|
||||
throw new LoadingFailedException("shader");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Change a 1-component parameter of the effect
|
||||
/// Change a vector2 parameter of the shader
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the parameter in the effect</param>
|
||||
/// <param name="name">Name of the parameter in the shader</param>
|
||||
/// <param name="v">Value of the parameter</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetParameter(string name, Vector2 v)
|
||||
{
|
||||
SetParameter(name, v.X, v.Y);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Change a 1-component parameter of the shader
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the parameter in the shader</param>
|
||||
/// <param name="x">Value of the parameter</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetParameter(string name, float x)
|
||||
{
|
||||
sfPostFX_SetParameter1(This, name, x);
|
||||
sfShader_SetParameter1(This, name, x);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Change a 2-component parameter of the effect
|
||||
/// Change a 2-component parameter of the shader
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the parameter in the effect</param>
|
||||
/// <param name="name">Name of the parameter in the shader</param>
|
||||
/// <param name="x">X component of the value</param>
|
||||
/// <param name="y">Y component of the value</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetParameter(string name, float x, float y)
|
||||
{
|
||||
sfPostFX_SetParameter2(This, name, x, y);
|
||||
sfShader_SetParameter2(This, name, x, y);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Change a 3-component parameter of the effect
|
||||
/// Change a 3-component parameter of the shader
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the parameter in the effect</param>
|
||||
/// <param name="name">Name of the parameter in the shader</param>
|
||||
/// <param name="x">X component of the value</param>
|
||||
/// <param name="y">Y component of the value</param>
|
||||
/// <param name="z">Z component of the value</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetParameter(string name, float x, float y, float z)
|
||||
{
|
||||
sfPostFX_SetParameter3(This, name, x, y, z);
|
||||
sfShader_SetParameter3(This, name, x, y, z);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Change a 4-component parameter of the effect
|
||||
/// Change a 4-component parameter of the shader
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the parameter in the effect</param>
|
||||
/// <param name="name">Name of the parameter in the shader</param>
|
||||
/// <param name="x">X component of the value</param>
|
||||
/// <param name="y">Y component of the value</param>
|
||||
/// <param name="z">Z component of the value</param>
|
||||
@ -107,30 +119,60 @@ namespace SFML
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetParameter(string name, float x, float y, float z, float w)
|
||||
{
|
||||
sfPostFX_SetParameter4(This, name, x, y, z, w);
|
||||
sfShader_SetParameter4(This, name, x, y, z, w);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Set a texture parameter
|
||||
/// </summary>
|
||||
/// <param name="name">Name of the texture in the effect</param>
|
||||
/// <param name="texture">Image to set (pass null to use the contents of the screen)</param>
|
||||
/// <param name="name">Name of the texture in the shader</param>
|
||||
/// <param name="texture">Image to set (pass null to use the texture of the object being drawn)</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void SetTexture(string name, Image texture)
|
||||
{
|
||||
myTextures[name] = texture;
|
||||
sfPostFX_SetTexture(This, name, texture != null ? texture.This : IntPtr.Zero);
|
||||
sfShader_SetTexture(This, name, texture != null ? texture.This : IntPtr.Zero);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Tell whether or not the system supports post-effects
|
||||
/// Bind the shader for rendering
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public static bool CanUsePostFX
|
||||
public void Bind()
|
||||
{
|
||||
get {return sfPostFX_CanUsePostFX();}
|
||||
sfShader_Bind(This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Unbind the shader
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public void Unbind()
|
||||
{
|
||||
sfShader_Unbind(This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Tell whether or not the system supports shaders
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public static bool IsAvailable
|
||||
{
|
||||
get {return sfShader_IsAvailable();}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// <summary>
|
||||
/// Special image representing the texture used by the object being drawn
|
||||
/// </summary>
|
||||
////////////////////////////////////////////////////////////
|
||||
public static Image CurrentTexture
|
||||
{
|
||||
get {return null;}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -145,7 +187,7 @@ namespace SFML
|
||||
Context.Global.SetActive(true);
|
||||
|
||||
myTextures.Clear();
|
||||
sfPostFX_Destroy(This);
|
||||
sfShader_Destroy(This);
|
||||
|
||||
if (!disposing)
|
||||
Context.Global.SetActive(false);
|
||||
@ -155,37 +197,40 @@ namespace SFML
|
||||
|
||||
#region Imports
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern IntPtr sfPostFx_Create();
|
||||
static extern IntPtr sfShader_Create();
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFx_Destroy(IntPtr This);
|
||||
static extern IntPtr sfShader_CreateFromFile(string Filename);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern IntPtr sfPostFX_CreateFromFile(string Filename);
|
||||
static extern IntPtr sfShader_CreateFromMemory(string Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern IntPtr sfPostFX_CreateFromMemory(string Effect);
|
||||
static extern void sfShader_Destroy(IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_Destroy(IntPtr PostFX);
|
||||
static extern void sfShader_SetParameter1(IntPtr Shader, string Name, float X);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_SetParameter1(IntPtr PostFX, string Name, float X);
|
||||
static extern void sfShader_SetParameter2(IntPtr Shader, string Name, float X, float Y);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_SetParameter2(IntPtr PostFX, string Name, float X, float Y);
|
||||
static extern void sfShader_SetParameter3(IntPtr Shader, string Name, float X, float Y, float Z);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_SetParameter3(IntPtr PostFX, string Name, float X, float Y, float Z);
|
||||
static extern void sfShader_SetParameter4(IntPtr Shader, string Name, float X, float Y, float Z, float W);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_SetParameter4(IntPtr PostFX, string Name, float X, float Y, float Z, float W);
|
||||
static extern void sfShader_SetTexture(IntPtr Shader, string Name, IntPtr Texture);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfPostFX_SetTexture(IntPtr PostFX, string Name, IntPtr Texture);
|
||||
static extern void sfShader_Bind(IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern bool sfPostFX_CanUsePostFX();
|
||||
static extern void sfShader_Unbind(IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern bool sfShader_IsAvailable();
|
||||
|
||||
#endregion
|
||||
}
|
||||
@ -366,10 +366,14 @@ namespace SFML
|
||||
/// Render the object into the given render window
|
||||
/// </summary>
|
||||
/// <param name="target">Target render window</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderWindow target)
|
||||
internal override void Render(RenderWindow target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderWindow_DrawShape(target.This, This);
|
||||
else
|
||||
sfRenderWindow_DrawShapeWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -377,10 +381,14 @@ namespace SFML
|
||||
/// Render the object into the given render image
|
||||
/// </summary>
|
||||
/// <param name="target">Target render image</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderImage target)
|
||||
internal override void Render(RenderImage target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderImage_DrawShape(target.This, This);
|
||||
else
|
||||
sfRenderImage_DrawShapeWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -466,9 +474,15 @@ namespace SFML
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawShape(IntPtr This, IntPtr Shape);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawShapeWithShader(IntPtr This, IntPtr Shape, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawShape(IntPtr This, IntPtr Shape);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawShapeWithShader(IntPtr This, IntPtr Shape, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern IntPtr sfShape_CreateLine(float P1X, float P1Y, float P2X, float P2Y, float Thickness, Color Col, float Outline, Color OutlineCol);
|
||||
|
||||
|
||||
@ -220,10 +220,14 @@ namespace SFML
|
||||
/// Render the object into the given render window
|
||||
/// </summary>
|
||||
/// <param name="target">Target render window</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderWindow target)
|
||||
internal override void Render(RenderWindow target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderWindow_DrawSprite(target.This, This);
|
||||
else
|
||||
sfRenderWindow_DrawSpriteWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -231,10 +235,14 @@ namespace SFML
|
||||
/// Render the object into the given render image
|
||||
/// </summary>
|
||||
/// <param name="target">Target render image</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderImage target)
|
||||
internal override void Render(RenderImage target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderImage_DrawSprite(target.This, This);
|
||||
else
|
||||
sfRenderImage_DrawSpriteWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -311,9 +319,15 @@ namespace SFML
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawSprite(IntPtr This, IntPtr Sprite);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawSpriteWithShader(IntPtr This, IntPtr Sprite, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawSprite(IntPtr This, IntPtr Sprite);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawSpriteWithShader(IntPtr This, IntPtr Sprite, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfSprite_Resize(IntPtr This, float Width, float Height);
|
||||
|
||||
|
||||
@ -261,10 +261,14 @@ namespace SFML
|
||||
/// Render the object into the given render window
|
||||
/// </summary>
|
||||
/// <param name="target">Target render window</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderWindow target)
|
||||
internal override void Render(RenderWindow target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderWindow_DrawString(target.This, This);
|
||||
else
|
||||
sfRenderWindow_DrawStringWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -272,10 +276,14 @@ namespace SFML
|
||||
/// Render the object into the given render image
|
||||
/// </summary>
|
||||
/// <param name="target">Target render image</param>
|
||||
/// <param name="shader">Shader to apply</param>
|
||||
////////////////////////////////////////////////////////////
|
||||
internal override void Render(RenderImage target)
|
||||
internal override void Render(RenderImage target, Shader shader)
|
||||
{
|
||||
if (shader == null)
|
||||
sfRenderImage_DrawString(target.This, This);
|
||||
else
|
||||
sfRenderImage_DrawStringWithShader(target.This, This, shader.This);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
@ -352,9 +360,15 @@ namespace SFML
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawString(IntPtr This, IntPtr String);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderWindow_DrawStringWithShader(IntPtr This, IntPtr String, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawString(IntPtr This, IntPtr String);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern void sfRenderImage_DrawStringWithShader(IntPtr This, IntPtr String, IntPtr Shader);
|
||||
|
||||
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
|
||||
static extern float sfString_GetWidth(IntPtr This);
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>8.0.50727</ProductVersion>
|
||||
<ProductVersion>9.0.21022</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{46786269-57B9-48E7-AA4F-8F4D84609FE6}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
@ -53,11 +53,11 @@
|
||||
<Compile Include="Drawable.cs" />
|
||||
<Compile Include="Font.cs" />
|
||||
<Compile Include="Image.cs" />
|
||||
<Compile Include="PostFx.cs" />
|
||||
<Compile Include="Rect.cs" />
|
||||
<Compile Include="RenderImage.cs" />
|
||||
<Compile Include="RenderTarget.cs" />
|
||||
<Compile Include="RenderWindow.cs" />
|
||||
<Compile Include="Shader.cs" />
|
||||
<Compile Include="Shape.cs" />
|
||||
<Compile Include="Sprite.cs" />
|
||||
<Compile Include="String2D.cs" />
|
||||
|
||||
@ -107,13 +107,13 @@ private :
|
||||
/// and adds a function to retrieve the recorded sound buffer
|
||||
/// (GetBuffer()).
|
||||
///
|
||||
/// As usual, don't forget to call the CanCapture() function
|
||||
/// As usual, don't forget to call the IsAvailable() function
|
||||
/// before using this class (see sf::SoundRecorder for more details
|
||||
/// about this).
|
||||
///
|
||||
/// Usage example:
|
||||
/// \code
|
||||
/// if (SoundBufferRecorder::CanCapture())
|
||||
/// if (SoundBufferRecorder::IsAvailable())
|
||||
/// {
|
||||
/// // Record some audio data
|
||||
/// SoundBufferRecorder recorder;
|
||||
|
||||
@ -96,7 +96,7 @@ public :
|
||||
/// \return True if audio capture is supported, false otherwise
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
static bool CanCapture();
|
||||
static bool IsAvailable();
|
||||
|
||||
protected :
|
||||
|
||||
@ -212,7 +212,7 @@ private :
|
||||
///
|
||||
/// The audio capture feature may not be supported or activated
|
||||
/// on every platform, thus it is recommended to check its
|
||||
/// availability with the CanCapture() function. If it returns
|
||||
/// availability with the IsAvailable() function. If it returns
|
||||
/// false, then any attempt to use an audio recorder will fail.
|
||||
///
|
||||
/// It is important to note that the audio capture happens in a
|
||||
@ -253,7 +253,7 @@ private :
|
||||
/// }
|
||||
///
|
||||
/// // Usage
|
||||
/// if (CustomRecorder::CanCapture())
|
||||
/// if (CustomRecorder::IsAvailable())
|
||||
/// {
|
||||
/// CustomRecorder recorder;
|
||||
/// recorder.Start();
|
||||
|
||||
@ -34,10 +34,10 @@
|
||||
#include <SFML/Graphics/Font.hpp>
|
||||
#include <SFML/Graphics/Glyph.hpp>
|
||||
#include <SFML/Graphics/Image.hpp>
|
||||
#include <SFML/Graphics/PostFX.hpp>
|
||||
#include <SFML/Graphics/RenderImage.hpp>
|
||||
#include <SFML/Graphics/RenderQueue.hpp>
|
||||
#include <SFML/Graphics/RenderWindow.hpp>
|
||||
#include <SFML/Graphics/Shader.hpp>
|
||||
#include <SFML/Graphics/Shape.hpp>
|
||||
#include <SFML/Graphics/Sprite.hpp>
|
||||
#include <SFML/Graphics/String.hpp>
|
||||
|
||||
@ -119,7 +119,7 @@ public :
|
||||
/// \return True if the RenderImage class can be used
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
static bool CanUseRenderImage();
|
||||
static bool IsAvailable();
|
||||
|
||||
private :
|
||||
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
#include <SFML/Config.hpp>
|
||||
#include <SFML/System/NonCopyable.hpp>
|
||||
#include <SFML/Graphics/Drawable.hpp>
|
||||
#include <SFML/Graphics/Image.hpp>
|
||||
#include <SFML/Graphics/Matrix3.hpp>
|
||||
#include <SFML/Graphics/Rect.hpp>
|
||||
#include <vector>
|
||||
@ -45,6 +44,9 @@ namespace priv
|
||||
class GeometryRenderer;
|
||||
}
|
||||
|
||||
class Image;
|
||||
class Shader;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Implements a queue of rendering commands
|
||||
///
|
||||
@ -194,6 +196,17 @@ public :
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetTexture(const Image* texture);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Set the current shader
|
||||
///
|
||||
/// Note: any call to this function after a call to BeginBatch
|
||||
/// will be ignored, and delayed until BeginBatch is called again.
|
||||
///
|
||||
/// \param shader New Shader
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetShader(const Shader* shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Begin a new geometry batch
|
||||
///
|
||||
@ -326,6 +339,7 @@ private :
|
||||
RenderStates* myCurrentStates; ///< Current set of render states
|
||||
Matrix3 myCurrentTransform; ///< Current combined projection-model-view matrix
|
||||
const Image* myCurrentTexture; ///< Current texture
|
||||
const Shader* myCurrentShader; ///< Current pixel shader
|
||||
Blend::Mode myCurrentBlendMode; ///< Current blending mode
|
||||
IntRect myCurrentViewport; ///< Current target viewport
|
||||
Vector2f myCurrentViewportSize; ///< Size of the current viewport (for vertex calculations)
|
||||
@ -358,10 +372,8 @@ private :
|
||||
///
|
||||
/// Usage example:
|
||||
/// \begincode
|
||||
/// void MyDrawable::Render(sf::RenderTarget& target)
|
||||
/// void MyDrawable::Render(sf::RenderTarget& target, sf::RenderQueue& queue)
|
||||
/// {
|
||||
/// RenderQueue& queue = target.GetRenderQueue();
|
||||
///
|
||||
/// queue.SetTexture(myImage);
|
||||
/// queue.BeginBatch();
|
||||
/// {
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
namespace sf
|
||||
{
|
||||
class Drawable;
|
||||
class Shader;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Base class for all render targets (window, image, ...)
|
||||
@ -65,7 +66,16 @@ public :
|
||||
/// \param object : Object to draw
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
virtual void Draw(const Drawable& object);
|
||||
void Draw(const Drawable& object);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Draw something into the target with a shader
|
||||
///
|
||||
/// \param object : Object to draw
|
||||
/// \param shader : Shader to apply
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void Draw(const Drawable& object, const Shader& shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Make sure that what has been drawn so far is rendered
|
||||
|
||||
@ -36,8 +36,6 @@
|
||||
|
||||
namespace sf
|
||||
{
|
||||
class Drawable;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Simple wrapper for sf::Window that allows easy
|
||||
/// 2D rendering
|
||||
|
||||
@ -22,15 +22,16 @@
|
||||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_POSTFX_HPP
|
||||
#define SFML_POSTFX_HPP
|
||||
#ifndef SFML_SHADER_HPP
|
||||
#define SFML_SHADER_HPP
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Graphics/Drawable.hpp>
|
||||
#include <SFML/Config.hpp>
|
||||
#include <SFML/Graphics/Image.hpp>
|
||||
#include <istream>
|
||||
#include <SFML/System/Vector2.hpp>
|
||||
#include <SFML/System/Vector3.hpp>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
@ -38,9 +39,9 @@
|
||||
namespace sf
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
/// PostFX is used to apply a post effect to a window
|
||||
/// Wrapper for pixel shaders
|
||||
////////////////////////////////////////////////////////////
|
||||
class SFML_API PostFX : public Drawable
|
||||
class SFML_API Shader
|
||||
{
|
||||
public :
|
||||
|
||||
@ -48,7 +49,7 @@ public :
|
||||
/// Default constructor
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
PostFX();
|
||||
Shader();
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Copy constructor
|
||||
@ -56,18 +57,18 @@ public :
|
||||
/// \param copy : Instance to copy
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
PostFX(const PostFX& copy);
|
||||
Shader(const Shader& copy);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Destructor
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
~PostFX();
|
||||
~Shader();
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Load the effect from a file
|
||||
/// Load the shader from a file
|
||||
///
|
||||
/// \param filename : Path of the effect file to load
|
||||
/// \param filename : Path of the shader file to load
|
||||
///
|
||||
/// \return True on success
|
||||
///
|
||||
@ -75,120 +76,138 @@ public :
|
||||
bool LoadFromFile(const std::string& filename);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Load the effect from a text in memory
|
||||
/// Load the shader from a text in memory
|
||||
///
|
||||
/// \param effect : String containing the code of the effect
|
||||
/// \param effect : String containing the code of the shader
|
||||
///
|
||||
/// \return True on success
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
bool LoadFromMemory(const std::string& effect);
|
||||
bool LoadFromMemory(const std::string& shader);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the effect (1 float)
|
||||
/// Change a parameter of the shader (1 float)
|
||||
///
|
||||
/// \param name : Name of the parameter in the effect
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param x : Value to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& name, float x);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the effect (2 floats)
|
||||
/// Change a parameter of the shader (2 floats)
|
||||
///
|
||||
/// \param name : Name of the parameter in the effect
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param x, y : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& Name, float x, float y);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the effect (3 floats)
|
||||
/// Change a parameter of the shader (3 floats)
|
||||
///
|
||||
/// \param name : Name of the parameter in the effect
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param x, y, z : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& Name, float x, float y, float z);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the effect (4 floats)
|
||||
/// Change a parameter of the shader (4 floats)
|
||||
///
|
||||
/// \param name : Name of the parameter in the effect
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param x, y, z, w : Values to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& Name, float x, float y, float Z, float w);
|
||||
void SetParameter(const std::string& Name, float x, float y, float z, float w);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the shader (1 vector2)
|
||||
///
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param v : Value to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& name, const Vector2f& v);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Change a parameter of the shader (1 vector3)
|
||||
///
|
||||
/// \param name : Name of the parameter in the shader
|
||||
/// \param v : Value to assign
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetParameter(const std::string& name, const Vector3f& v);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Set a texture parameter
|
||||
///
|
||||
/// \param name : Name of the texture in the effect
|
||||
/// \param texture : Image to set (pass NULL to use content of current framebuffer)
|
||||
/// \param name : Name of the texture in the shader
|
||||
/// \param texture : Image to set (pass Shader::CurrentTexture to use the current texture)
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void SetTexture(const std::string& name, const Image* texture);
|
||||
void SetTexture(const std::string& name, const Image& texture);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Bind the shader for rendering
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void Bind() const;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Unbind the shader
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void Unbind() const;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Assignment operator
|
||||
///
|
||||
/// \param other : Instance to assign
|
||||
/// \param right Instance to assign
|
||||
///
|
||||
/// \return Reference to the post-effect
|
||||
/// \return Reference to self
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
PostFX& operator =(const PostFX& other);
|
||||
Shader& operator =(const Shader& right);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Tell whether or not the system supports post-effects
|
||||
/// Tell whether or not the system supports shaders
|
||||
///
|
||||
/// \return True if the system can use post-effects
|
||||
/// \return True if the system can use shaders
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
static bool CanUsePostFX();
|
||||
|
||||
protected :
|
||||
static bool IsAvailable();
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// /see Drawable::Render
|
||||
///
|
||||
// Static member data
|
||||
////////////////////////////////////////////////////////////
|
||||
virtual void Render(RenderTarget& target, RenderQueue& queue) const;
|
||||
static const Image CurrentTexture; ///< Special image representing the texture used by the object being drawn
|
||||
|
||||
private :
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Preprocess a SFML effect file
|
||||
/// to convert it to a valid GLSL fragment shader
|
||||
///
|
||||
/// \param file : Stream containing the code to process
|
||||
///
|
||||
/// \return Valid fragment shader source code
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
static std::string PreprocessEffect(std::istream& file);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Create the program and attach the shaders
|
||||
///
|
||||
/// \return True on success, false if any error happened
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
void CreateProgram();
|
||||
bool CompileProgram();
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Types
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef std::map<std::string, const Image*> TextureTable;
|
||||
typedef std::map<int, const Image*> TextureTable;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Member data
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int myShaderProgram; ///< OpenGL identifier for the program
|
||||
TextureTable myTextures; ///< Texture variables in the effect
|
||||
int myCurrentTexture; ///< Location of the current texture in the shader
|
||||
TextureTable myTextures; ///< Texture variables in the shader, mapped to their location
|
||||
std::string myFragmentShader; ///< Fragment shader source code
|
||||
mutable Image myFrameBuffer; ///< Texture containing the current frame buffer
|
||||
};
|
||||
|
||||
} // namespace sf
|
||||
|
||||
|
||||
#endif // SFML_POSTFX_HPP
|
||||
#endif // SFML_SHADER_HPP
|
||||
@ -1,16 +0,0 @@
|
||||
texture framebuffer
|
||||
float offset
|
||||
|
||||
effect
|
||||
{
|
||||
vec2 offx = vec2(offset, 0.0);
|
||||
vec2 offy = vec2(0.0, offset);
|
||||
|
||||
vec4 c0 = framebuffer(_in);
|
||||
vec4 c1 = framebuffer(_in - offy);
|
||||
vec4 c2 = framebuffer(_in + offy);
|
||||
vec4 c3 = framebuffer(_in - offx);
|
||||
vec4 c4 = framebuffer(_in + offx);
|
||||
|
||||
_out = c0 * 0.2 + c1 * 0.2 + c2 * 0.2 + c3 * 0.2 + c4 * 0.2;
|
||||
}
|
||||
Binary file not shown.
@ -1,10 +0,0 @@
|
||||
texture framebuffer
|
||||
vec3 color
|
||||
|
||||
effect
|
||||
{
|
||||
vec4 pixel = framebuffer(_in);
|
||||
float gray = pixel.r * 0.39 + pixel.g * 0.50 + pixel.b * 0.11;
|
||||
|
||||
_out = vec4(gray * color, 1.0) * 0.6 + pixel * 0.4;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
texture framebuffer
|
||||
vec2 mouse
|
||||
|
||||
effect
|
||||
{
|
||||
float len = distance(_in, mouse) * 7.0;
|
||||
|
||||
if (len < 1.0)
|
||||
_out = framebuffer(_in + (_in - mouse) * len);
|
||||
else
|
||||
_out = framebuffer(_in);
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
texture framebuffer
|
||||
|
||||
effect
|
||||
{
|
||||
_out = framebuffer(_in);
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
texture framebuffer
|
||||
vec2 mouse
|
||||
|
||||
effect
|
||||
{
|
||||
float factor = 5 + 100 * length(mouse);
|
||||
|
||||
vec2 pos = floor(_in * factor) / factor;
|
||||
|
||||
_out = framebuffer(pos);
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
texture framebuffer
|
||||
texture wave
|
||||
vec2 offset
|
||||
|
||||
effect
|
||||
{
|
||||
vec2 texoffset = wave(_in * offset).xy;
|
||||
texoffset -= vec2(0.5, 0.5);
|
||||
texoffset *= 0.05;
|
||||
|
||||
_out = framebuffer(_in + texoffset);
|
||||
}
|
||||
BIN
samples/bin/datas/shader/arial.ttf
Normal file
BIN
samples/bin/datas/shader/arial.ttf
Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user