WiP - Work in Progress - Part XVIII
Übersicht![](/themes/Standard/arrow.png)
![](/themes/Standard/arrow.png)
Gehe zu Seite Zurück 1, 2, 3, 4, 5, 6, 7
![]() |
Xaymarehemals "Cgamer" |
![]() Antworten mit Zitat ![]() |
---|---|---|
Multi-post aber da hier sonst kein anderer was schreibt.
Ich hab die Tage mal daran gearbeitet BlitzExtensions komplett zu überarbeiten und ein paar neue Features einzubauen. BlitzSteam braucht nun nicht mehr BlitzUtility (braucht allerdings noch BlitzPointer) um zu funktionieren und hat nun HTMLSurface Support! Code: [AUSKLAPPEN] Include "../BlitzSteam.bb"
;---------------------------------------------------------------- ;! Steam Stuff ;---------------------------------------------------------------- ; SteamClient: WarningMessageHook Global Steam_WarningMessageHook_Callback = 0 Function Steam_WarningMessageHook(bIsWarning%, pchMessageBuffer%) If Steam_WarningMessageHook_Callback = 0 Then Steam_WarningMessageHook_Callback = BP_GetFunctionPointer() Return EndIf ; Read Message from buffer Local msg$ = "" If bIsWarning = 1 Then msg = "[Warning]" Else msg = "[Info]" EndIf msg = msg + PeekMemoryStringC(pchMessageBuffer) DebugLog "[Steam]" + msg$ End Function:Steam_WarningMessageHook(0, 0) Function PeekMemoryStringC(Memory%, Length%=-1) Local Ptr = Memory Local iChar = 0, tiChar = 0 Local sOut$ = "" Repeat tiChar = PeekMemoryByte(Ptr) ; Advance memory, decrease Length Ptr = Ptr + 1 Length = Length - 1 If (tiChar = 0) Then Length = 0 Else sOut = sOut + Chr(tiChar) EndIf Until Length = 0 Return sOut End Function ;---------------------------------------------------------------- ;! SteamBrowser (Image & Texture Drawing) ;---------------------------------------------------------------- Global SteamBrowser_Callback_BrowserReady_p = 0, SteamBrowser_Callback_BrowserReady_c = 0 Global SteamBrowser_Callback_NeedsPaint_p = 0, SteamBrowser_Callback_NeedsPaint_c = 0 Global SteamBrowser_Callback_StartRequest_p = 0, SteamBrowser_Callback_StartRequest_c = 0 Type SteamBrowser Field Id%, lSteamAPICall% Field Size%[1] ;Width, Height Field URL$ ; CEF Stuff Field UpdateRegion[3] ;X,Y,W,H Field Serial%, Scale#, ScrollX%, ScrollY% ; Image Based Field hImage% ; Texture Based Field hTexture% End Type Function SteamBrowser_Create.SteamBrowser(Width%, Height%, URL$="http://google.com/", UserAgent$="SteamBrowser", UserCSS$="") ; Create our Object Local SB.SteamBrowser = New SteamBrowser SB\Id = 0 ; Initialize to 0 until the Browser is ready. SB\Size[0] = Width SB\Size[1] = Height SB\URL = URL SB\lSteamAPICall = BS_ISteamHTMLSurface_CreateBrowser(BS_SteamHTMLSurface(), UserAgent, UserCSS) ; We need to register our callbacks, or nothing will work. BS_Callback_RegisterResult SteamBrowser_Callback_BrowserReady_c, SB\lSteamAPICall, BS_SteamHTMLSurface_BrowserReady ; Listen to the result of the last SteamAPICall. BS_Callback_Register SteamBrowser_Callback_NeedsPaint_c, BS_SteamHTMLSurface_NeedsPaint BS_Callback_Register SteamBrowser_Callback_StartRequest_c, BS_SteamHTMLSurface_StartRequest ; Image Based SB\hImage = CreateImage(SB\Size[0], SB\Size[1]) ; Texture Based SB\hTexture = CreateTexture(SB\Size[0], SB\Size[1], 1+2) Return SB End Function Function SteamBrowser_Destroy(SB.SteamBrowser) ; Texture Based FreeTexture SB\hTexture ; Image Based FreeImage SB\hImage BS_ISteamHTMLSurface_RemoveBrowser BS_SteamHTMLSurface(), SB\Id Delete SB End Function Function SteamBrowser_Find.SteamBrowser(iId%, lSteamAPICall%) Local SB.SteamBrowser = Null ; Find by Id If iId <> 0 For SB.SteamBrowser = Each SteamBrowser If (SB\Id = iId) Then Return SB EndIf Next EndIf ; Find by SteamAPICall If lSteamAPICall <> 0 For SB.SteamBrowser = Each SteamBrowser If (SB\lSteamAPICall <> 0) And (BS_Long_Compare(lSteamAPICall, SB\lSteamAPICall) = 0) Then Return SB EndIf Next EndIf Return Null End Function Function SteamBrowser_SetSize(SB.SteamBrowser, Width%, Height%) SB\Size[0] = Width SB\Size[1] = Height ; Update Browser Size BS_ISteamHTMLSurface_SetSize BS_SteamHTMLSurface(), SB\Id, Width, Height ; Image Based FreeImage(SB\hImage) SB\hImage = CreateImage(Width, Height) ; Texture Based FreeTexture(SB\hTexture) SB\hTexture = CreateTexture(Width, Height, 1+2) End Function Function SteamBrowser_LoadUrl(SB.SteamBrowser, URL$, PostData$="") BS_ISteamHTMLSurface_LoadURL BS_SteamHTMLSurface(), SB\Id, URL, PostData End Function Function SteamBrowser_IsReady(SB.SteamBrowser) Return (SB\Id <> 0) End Function Function SteamBrowser_GetImageHandle(SB.SteamBrowser) Return SB\hImage End Function Function SteamBrowser_GetTextureHandle(SB.SteamBrowser) Return SB\hTexture End Function Function SteamBrowser_Callback_BrowserReady(pvParam%, bIOFailure, lSteamAPICall) If (SteamBrowser_Callback_BrowserReady_p = 0) Then SteamBrowser_Callback_BrowserReady_p = BP_GetFunctionPointer() SteamBrowser_Callback_BrowserReady_c = BS_Callback_New(SteamBrowser_Callback_BrowserReady_p) Return EndIf ; Search for a valid SteamBrowser object. Local SB.SteamBrowser = SteamBrowser_Find(0, lSteamAPICall) SB\Id = BS_Memory_PeekInt(pvParam, 0) SteamBrowser_SetSize(SB, SB\Size[0], SB\Size[1]) SteamBrowser_LoadUrl(SB, SB\URL) ; Destroy our SteamAPICall pointer and clear the value. BS_Long_Destroy(SB\lSteamAPICall):SB\lSteamAPICall = 0 End Function:SteamBrowser_Callback_BrowserReady(0, 0, 0) Function SteamBrowser_Callback_NeedsPaint(pvParam%, p2, p3) If (SteamBrowser_Callback_NeedsPaint_p = 0) Then SteamBrowser_Callback_NeedsPaint_p = BP_GetFunctionPointer() SteamBrowser_Callback_NeedsPaint_c = BS_Callback_New(SteamBrowser_Callback_NeedsPaint_p) Return EndIf ; Search for a valid SteamBrowser object. Local SB.SteamBrowser = SteamBrowser_Find(BS_Memory_PeekInt(pvParam, 0), 0) ; Parse Data from pvParam Local pBuffer, pW, pH, pUpdateX, pUpdateY, pUpdateW, pUpdateH, pScrollX, pScrollY, pScale#, pSerial pBuffer = BS_Memory_PeekInt(pvParam, 4) pW = BS_Memory_PeekInt(pvParam, 8) pH = BS_Memory_PeekInt(pvParam, 12) pUpdateX = BS_Memory_PeekInt(pvParam, 16) pUpdateY = BS_Memory_PeekInt(pvParam, 20) pUpdateW = BS_Memory_PeekInt(pvParam, 24) pUpdateH = BS_Memory_PeekInt(pvParam, 28) pScrollX = BS_Memory_PeekInt(pvParam, 32) pScrollY = BS_Memory_PeekInt(pvParam, 36) pScale = BS_Memory_PeekFloat(pvParam, 40) pSerial = BS_Memory_PeekInt(pvParam, 44) ; Assign to Object SB\UpdateRegion[0] = pUpdateX SB\UpdateRegion[1] = pUpdateY SB\UpdateRegion[2] = pUpdateW SB\UpdateRegion[3] = pUpdateH SB\Scale = pScale SB\ScrollX = pScrollX SB\ScrollY = pScrollY SB\Serial = pSerial ; Fix up Buffer Size (Always next bigger 16*n, for whatever reason (SIBLY WHAT DID YOU DO!?)) Local nW = (16 * Ceil(pW / 16.0)) ;DebugLog ImageWidth(SB\hImage) + ":" + ImageHeight(SB\hImage) ; Image Based Local hImageBuffer = ImageBuffer(SB\hImage) LockBuffer hImageBuffer BS_Helper_CopyMemoryIntMangle pBuffer, BS_Memory_PeekInt(hImageBuffer, 72), 0, pW, pH, nW, SB\Size[1], pUpdateX, pUpdateY, pUpdateW, pUpdateH UnlockBuffer hImageBuffer ; Texture Based (Identical) Local hTextureBuffer = ImageBuffer(SB\hImage) LockBuffer hTextureBuffer BS_Helper_CopyMemoryIntMangle pBuffer, BS_Memory_PeekInt(hTextureBuffer, 72), 0, pW, pH, nW, SB\Size[1], pUpdateX, pUpdateY, pUpdateW, pUpdateH UnlockBuffer hTextureBuffer ; pvParam Structure ;CALLBACK_MEMBER(0, HHTMLBrowser, unBrowserHandle) // the browser that needs the paint ;CALLBACK_MEMBER(1, const char *, pBGRA ) // a pointer to the B8G8R8A8 data for this surface, valid until SteamAPI_RunCallbacks is next called ;CALLBACK_MEMBER(2, uint32, unWide) // the total width of the pBGRA texture ;CALLBACK_MEMBER(3, uint32, unTall) // the total height of the pBGRA texture ;CALLBACK_MEMBER(4, uint32, unUpdateX) // the offset in X for the damage rect for this update ;CALLBACK_MEMBER(5, uint32, unUpdateY) // the offset in Y for the damage rect for this update ;CALLBACK_MEMBER(6, uint32, unUpdateWide) // the width of the damage rect for this update ;CALLBACK_MEMBER(7, uint32, unUpdateTall) // the height of the damage rect for this update ;CALLBACK_MEMBER(8, uint32, unScrollX) // the page scroll the browser was at when this texture was rendered ;CALLBACK_MEMBER(9, uint32, unScrollY) // the page scroll the browser was at when this texture was rendered ;CALLBACK_MEMBER(10, float, flPageScale) // the page scale factor on this page when rendered ;CALLBACK_MEMBER(11, uint32, unPageSerial) // incremented on each new page load, you can use this to reject draws while navigating to new pages End Function:SteamBrowser_Callback_NeedsPaint(0, 0, 0) Function SteamBrowser_Callback_StartRequest(pvParam%, p2, p3) If (SteamBrowser_Callback_StartRequest_p = 0) Then SteamBrowser_Callback_StartRequest_p = BP_GetFunctionPointer() SteamBrowser_Callback_StartRequest_c = BS_Callback_New(SteamBrowser_Callback_StartRequest_p) Return EndIf ; Search for a valid SteamBrowser object. Local SB.SteamBrowser = SteamBrowser_Find(BS_Memory_PeekInt(pvParam, 0), 0) ; Default to allow all requests. (Why not? For an Example, this is good enough.) ; Could implement a simple filter using a second type, but why don't you experiment a bit? BS_ISteamHTMLSurface_AllowStartRequest BS_SteamHTMLSurface(), SB\Id, True End Function:SteamBrowser_Callback_StartRequest(0, 0, 0) ;---------------------------------------------------------------- ;! Example Code ;---------------------------------------------------------------- If BS_SteamAPI_Init() = 0 Then RuntimeError "Steam failed to initialize." ; Steam: Hooks, Callbacks, CallResults BS_ISteamClient_SetWarningMessageHook BS_SteamClient(), Steam_WarningMessageHook_Callback ; Steam: HTMLSurface API If BS_SteamHTMLSurface() = 0 Then RuntimeError "Steam: HTMLSurface API is not available." If BS_ISteamHTMLSurface_Init(BS_SteamHTMLSurface()) = 0 Then RuntimeError "Steam: HTMLSurface API did not want to be initialized?!" ;BS_ISteamHTMLSurface_SetSize BS_SteamHTMLSurface(), 0, GraphicsWidth(), GraphicsHeight() Const FPS = 60 Const FPS_MULT# = 1.0 / FPS ; Demo Scene Graphics3D 1024, 768, 32, 2 SetBuffer BackBuffer() Local demoTimer = CreateTimer(FPS) Local demoRoot = CreatePivot() Local demoCameraRoot = CreatePivot(demoRoot) Local demoCamera = CreateCamera(demoCameraRoot) MoveEntity demoCamera, 0, 0, -10 Local demoCube = CreateCube(demoRoot) ; Create a Browser Local myBrowser.SteamBrowser = SteamBrowser_Create(GraphicsWidth(), GraphicsHeight(), "http://store.steampowered.com/app/368720/") Local Mouse[3], MouseButton[3], Key[255] While Not KeyHit(1) Cls ; Only allow input when the browser is up to date. ;If (myBrowser\iLastDraw > myBrowser\iLastRequest) Then If True ; Mouse Input If Mouse[0] <> MouseX() Or Mouse[1] <> MouseY() Then Mouse[0] = MouseX() Mouse[1] = MouseY() BS_ISteamHTMLSurface_MouseMove BS_SteamHTMLSurface(), myBrowser\Id, MouseX(), MouseY() EndIf If Mouse[2] <> MouseZ() Then Mouse[2] = MouseZ() BS_ISteamHTMLSurface_MouseWheel BS_SteamHTMLSurface(), myBrowser\Id, MouseZSpeed()*30 EndIf Local Button For Button = 1 To 3 Local ButtonDown = MouseDown(Button) If MouseButton[Button] <> ButtonDown Then MouseButton[Button] = MouseDown(Button) If ButtonDown BS_ISteamHTMLSurface_MouseDown BS_SteamHTMLSurface(), myBrowser\Id, Button - 1 Else BS_ISteamHTMLSurface_MouseUp BS_SteamHTMLSurface(), myBrowser\Id, Button - 1 EndIf EndIf Next ; Keyboard Local Modifier = BS_EHTMLKeyModifiers_None If KeyDown(42) Or KeyDown(54) Then Modifier = Modifier Or BS_EHTMLKeyModifiers_ShiftDown If KeyDown(29) Or KeyDown(157) Or KeyDown(184) Then Modifier = Modifier Or BS_EHTMLKeyModifiers_CtrlDown If KeyDown(56) Or KeyDown(184) Then Modifier = Modifier Or BS_EHTMLKeyModifiers_AltDown Local VK For VK = 0 To 255 Local SC = InputEx_User32_MapVirtualKeyEx(VK, 0, 0) Local KeyDownN = KeyDown(SC) If Key[VK] <> KeyDownN Then Key[VK] = KeyDownN If KeyDownN = 1 Then BS_ISteamHTMLSurface_KeyDown BS_SteamHTMLSurface(), myBrowser\Id, VK, Modifier Else BS_ISteamHTMLSurface_KeyUp BS_SteamHTMLSurface(), myBrowser\Id, VK, Modifier EndIf EndIf Next Local GetKeyC = GetKey() If GetKeyC BS_ISteamHTMLSurface_KeyChar BS_SteamHTMLSurface(), myBrowser\Id, GetKeyC, Modifier EndIf EndIf ; Steam: Run any Callbacks ; Q: Why before RenderWorld/Flip? ; A: If we did any changes, having them available before Rendering helps responsiveness. ; A one-frame Delay is noticeable, even to people claiming the eye only sees 30 fps. ; Please read a Biology book if you are one of those, it doesn't work like that. BS_SteamAPI_RunCallbacks() RenderWorld ;If (myBrowser\iLastDraw > myBrowser\iLastRequest) Then If Not KeyDown(57) DrawBlock SteamBrowser_GetImageHandle(myBrowser), 0, 0, 0 Color 255, 0, 0 Rect myBrowser\UpdateRegion[0],myBrowser\UpdateRegion[1],myBrowser\UpdateRegion[2],myBrowser\UpdateRegion[3], 0 Else EntityTexture demoCube, SteamBrowser_GetTextureHandle(myBrowser) EndIf ;EndIf Flip WaitTimer demoTimer Wend ; Destroy existing Browser SteamBrowser_Destroy(myBrowser):myBrowser = Null ; Steam: HTMLSurface API BS_ISteamHTMLSurface_Shutdown(BS_SteamHTMLSurface()) BS_SteamAPI_Shutdown() EndGraphics End ![]() ![]() Läuft auf vollen 60fps, lässt sich also für UI und andere dinge verwenden. Yay für CEF! |
||
![]() |
diceman |
![]() Antworten mit Zitat ![]() |
---|---|---|
Hallo ihr Lieben!
Ich glaube im Leben eines jeden (Hobby-)Programmiers kommt einmal der Moment, wo man darüber nachdenkt, ein RPG zu basteln. Ganz so hoch möchte ich gar nicht hinaus, aber vielleicht mal was Rogue-lite-mäßiges? Keine Ahnung, was aus der Spinnerei mal wird, aber als kleine Fingerübung habe ich mich gestern hingesetzt und 'ne Routine gebastelt, die mir zufällig generierte Dungeons erstellt. Etwas Feinschliff und der ein- oder andere Check gewisser unvorteilhafter geometrischer Eigenheiten sind noch notwendig, aber so schaut's bislang aus ... ![]() ![]() |
||
Now these points of data make a beautiful line,
And we're out of Beta, we're releasing on time. |
![]() |
Xaymarehemals "Cgamer"Betreff: BlitzNext (Blitz3D "Fortführung") |
![]() Antworten mit Zitat ![]() |
---|---|---|
Seit einiger Zeit arbeite ich daran die vorhandenen Bugs in Blitz3D zu beheben, heute kann ich nun die erste Version veröffentlichen bei der es nicht zu unerwarteten MAVs führt! Ich fasse die Änderungen kurz zusammen:
Download: https://github.com/Xaymar/Blit...v1200-pre1 Zum installieren extrahiert ihr Runtime.dll, Fmod.dll und FreeImage.dll in den /bin/ Ordner eurer Blitz3D installation. Fmod.dll und FreeImage.dll müssen bei kompilierten .exe mitgeliefert werden. Optional könnt ihr auch Linker.dll, Debugger.dll, BlitzCC.exe und BlitzBasicLauncher.exe extrahieren - diese sind derzeit noch nicht ganz getestet und haben mit Sicherheit noch Probleme. |
||
![]() |
DAK |
![]() Antworten mit Zitat ![]() |
---|---|---|
Coole Sache! Das ist ja mal eine sinnvolle Bearbeitung von Blitz!
Eine Frage nur, ein schnelles Read/Write/CopyPixel, wo man vorher explizit LockBuffer und UnlockBuffer verwenden muss, ist das nicht equivalent zu ReadPixelFast/WritePixelFast/CopyPixelFast? |
||
Gewinner der 6. und der 68. BlitzCodeCompo |
![]() |
Xaymarehemals "Cgamer" |
![]() Antworten mit Zitat ![]() |
---|---|---|
Edit: Angewohnheit - hier ist das ja nicht so üblich ^^
ReadPixel, WritePixel und CopyPixel prüfen ob die Koordinaten im buffer liegen. Zugleich werden diese auch für interne Funktionen benutzt - was bei Sirius Online so ca. 15 fps extra gab. Edit: Stell dir das so vor, vorher war das intern bei Loop-aufrufen so: Code: [AUSKLAPPEN] buf.lock(); tbuf.lock();
for (uint32_t x = 0; x < buf.width; ++x) { for (uint32_t y = 0; y < buf.height; ++y) { buf.copyPixel(x, y, tbuf, x, y); } } buf.unlock();tbuf.unlock(); buf.copyPixel hat dann den .lock und .unlock (was eine GPU-synchronization verursacht) erneut aufgerufen. Nicht schön, im neuen Format ist das eindeutig besser. |
||
![]() |
DAK |
![]() Antworten mit Zitat ![]() |
---|---|---|
Hmm, wundert mich ein wenig, dass das da CopyPixel und nicht CopyPixelFast aufgerufen hat. Wäre ja recht sinnvoll, in diesem Fall die Grenzen von x und y ein Mal vor der Schleife zu checken und dann immer CopyPixelFast aufzurufen.
So wie ich deine Erklärung verstanden habe, macht die CopyPixel-Funktion ja Folgendes: Check ob Koordinaten in Buffer Lock Buffer CopyPixelFast Unlock Buffer Jetzt könnte man die internen Funktionen alle umschreiben, so dass sie den Check ein Mal vorher für alle Pixel machen, dann locken, dann die Fast-Funktionen verwenden und dann unlocken. Das sollte eigentlich auch Einiges an Geschwindigkeit schaffen. Müsste der Code dann hald so ausschauen: Code: [AUSKLAPPEN] buf.lock(); tbuf.lock();
uint32_t xMax = min(buf.width,tbuf.width); uint32_t yMax = min(buf.height,tbuf.height); for (uint32_t x = 0; x < xMax; ++x) { for (uint32_t y = 0; y < yMax; ++y) { buf.copyPixelFast(x, y, tbuf, x, y); } } buf.unlock();tbuf.unlock(); |
||
Gewinner der 6. und der 68. BlitzCodeCompo |
![]() |
Xaymarehemals "Cgamer" |
![]() Antworten mit Zitat ![]() |
---|---|---|
Klar, so machen könnte man es, aber es lohnt sich nicht für etwas das so oder so zwischen Lock- & UnlockBuffer ist viel code umzuschreiben. Das BlitzNext projekt ist eh nur temporär aktiv um Sirius Online einiges an Stabilität und performance zu geben - was erfolgreich geklappt hat. | ||
Gehe zu Seite Zurück 1, 2, 3, 4, 5, 6, 7
Übersicht
![](/themes/Standard/arrow.png)
![](/themes/Standard/arrow.png)
Powered by phpBB © 2001 - 2006, phpBB Group