Permalink
Browse files

Another bugfix.

  • Loading branch information...
1 parent 8f5be29 commit a539abffd66445ad00b5a7d81ca49c014574473e @schlunsen committed Nov 11, 2010
Showing with 31 additions and 29 deletions.
  1. +4 −1 Assets/AwesomiumWrapper/AwesomiumMeshRender.cs
  2. +1 −1 Assets/GUI/ControlWindow.cs
  3. BIN Assets/Plugins/UnityAwesomium.dll
  4. BIN Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
  5. BIN Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
  6. BIN Library/ScriptAssemblies/Assembly-CSharp.dll
  7. BIN Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
  8. BIN Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
  9. BIN Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
  10. BIN Library/assetDatabase3
  11. BIN Library/cache/a8/a8a85186e5d6a0f499559738477fbdfd
  12. BIN Library/cache/fb/fbf51a8f488eb954ab1b7f2566dfd56f
  13. BIN UnityAwesomium.suo
  14. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.dll
  15. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.exp
  16. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.lib
  17. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.pdb
  18. +4 −5 UnityAwesomiumSource/Unity/Unity/AwesomiumPlugin.cpp
  19. BIN UnityAwesomiumSource/Unity/Unity/Release/AwesomiumPlugin.obj
  20. BIN UnityAwesomiumSource/Unity/Unity/Release/BuildLog.htm
  21. +1 −1 UnityAwesomiumSource/Unity/Unity/Release/mt.dep
  22. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.idb
  23. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.pdb
  24. BIN UnityAwesomiumSource/Unity/UnityAwesomium.ncb
  25. BIN UnityAwesomiumSource/Unity/UnityAwesomium.suo
  26. +8 −8 build/awesomium.log
  27. BIN build/test_Data/Managed/Assembly-CSharp-firstpass.dll
  28. BIN build/test_Data/Managed/Assembly-CSharp.dll
  29. BIN build/test_Data/Managed/Assembly-UnityScript-firstpass.dll
  30. BIN build/test_Data/Plugins/UnityAwesomium.dll
  31. +13 −13 build/test_Data/output_log.txt
  32. BIN obj/Debug/Irrelvant.dll
  33. BIN obj/Debug/Irrelvant.pdb
  34. BIN obj/Debug/ResolveAssemblyReference.cache
@@ -131,21 +131,24 @@ public void ApplyTexture()
public void Loadfile(string filePath)
{
+ if (isAwesomiumInit)
AwesomiumWrapper.LoadFile(m_TextureID,filePath);
}
public void LoadURL(string url){
+ if (isAwesomiumInit)
AwesomiumWrapper.LoadURL(m_TextureID, url);
}
public void DestroyAwesomiumWindow()
{
try
{
- isAwesomiumInit = false;
+
AwesomiumWrapper.DestroyAwesomiumWebView(m_TextureID);
m_pixelsHandler.Free();
GetComponent<BrowserGUIEvents>().interactive = false;
+ isAwesomiumInit = false;
}
catch (System.Exception e)
{
@@ -81,7 +81,7 @@ private void DrawTopLeft()
drawDestroyInitComponents();
}
-
+
private void drawDestroyInitComponents()
{
if (meshRender.isAwesomiumInit)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -19,9 +19,10 @@ class AwesomiumWindow : public Awesomium::WebViewListener
typedef void (*SetPixelsFunc)(/*int left, int top, int width, int height*/);
typedef void (*ApplyTextureFunc)();
- //Delegates / callback functions
+ //Delegates - callback functions
SetPixelsFunc m_setPixelsFunc;
ApplyTextureFunc m_applyTextureFunc;
+
bool isEnabled;
float* pixelBuffer;
int m_width;
@@ -36,10 +37,8 @@ class AwesomiumWindow : public Awesomium::WebViewListener
pixelBuffer = buffer;
isEnabled = true;
// hookup callbacks
- setPaintFunctions(setPixelFunc,applyTextureFunc);
-
- m_webView = webCore->createWebView(m_width,m_height);
-
+ setPaintFunctions(setPixelFunc,applyTextureFunc);
+ m_webView = webCore->createWebView(m_width,m_height);
m_webView->setListener(this);
//m_webView->loadURL("http:://google.dk");//url);
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
-Manifest resource last updated at 16:19:01,20 on 11-11-2010
+Manifest resource last updated at 16:46:26,48 on 11-11-2010
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,11 +1,11 @@
-[1111/161944:INFO:WebCore.cpp(74)] Creating the core thread.
-[1111/161944:INFO:WebCore.cpp(84)] Creating the WebCore.
-[1111/161944:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
-[1111/161944:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
-[1111/161944:INFO:WebView.cpp(68)] A new WebView has been created.
-[1111/161944:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
-[1111/161944:INFO:WebViewProxy.cpp(150)] WebViewProxy[2] has been created.
-[1111/161945:INFO:proxy_service.cc(619)] New proxy configuration was loaded:
+[1111/164940:INFO:WebCore.cpp(74)] Creating the core thread.
+[1111/164940:INFO:WebCore.cpp(84)] Creating the WebCore.
+[1111/164940:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
+[1111/164940:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
+[1111/164940:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
+[1111/164940:INFO:WebView.cpp(68)] A new WebView has been created.
+[1111/164940:INFO:WebViewProxy.cpp(150)] WebViewProxy[2] has been created.
+[1111/164941:INFO:proxy_service.cc(619)] New proxy configuration was loaded:
{
auto_detect: 0
pac_url:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -6,13 +6,13 @@ Direct3D:
Vendor: ATI
VRAM: 624 MB
Caps: Shader=30 DepthRT=1 NativeDepth=1 NativeShadow=1 DF16=1 DF24=1 INTZ=0 RAWZ=0 NULL=0 RESZ=1 SlowINTZ=1
+desktop: 1920x1080 59Hz; virtual: 1920x1080 at 0,0
<I> Initializing (RawInput).
<RI> Input initialized.
-desktop: 1920x1080 59Hz; virtual: 1920x1080 at 0,0
-Non platform assembly: data-0301F370 (this message is harmless)
-Non platform assembly: data-03081BE0 (this message is harmless)
-Non platform assembly: data-03084450 (this message is harmless)
-Non platform assembly: data-030990C0 (this message is harmless)
+Non platform assembly: data-02F7F370 (this message is harmless)
+Non platform assembly: data-02FE1BE0 (this message is harmless)
+Non platform assembly: data-02FE4450 (this message is harmless)
+Non platform assembly: data-02FF90C0 (this message is harmless)
The referenced script on this Behaviour is missing!
(Filename: ..\..\Runtime\Mono\MonoBehaviour.cpp Line: 1695)
@@ -52,19 +52,19 @@ init awsommium
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawChangeWindowSize()
+ControlWindow:drawDestroyInitComponents()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
UnityEngine.GUI:BeginWindows(Event, Int32, IDList, Int32)
(Filename: ..\..\Runtime\Export\Generated\BaseClass.cpp Line: 2528)
-textID : -10068
+textID : -10070
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawChangeWindowSize()
+ControlWindow:drawDestroyInitComponents()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
@@ -76,7 +76,7 @@ done init awsommium
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawChangeWindowSize()
+ControlWindow:drawDestroyInitComponents()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
@@ -88,19 +88,19 @@ init awsommium
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawDestroyInitComponents()
+ControlWindow:drawChangeWindowSize()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
UnityEngine.GUI:BeginWindows(Event, Int32, IDList, Int32)
(Filename: ..\..\Runtime\Export\Generated\BaseClass.cpp Line: 2528)
-textID : -10084
+textID : -10074
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawDestroyInitComponents()
+ControlWindow:drawChangeWindowSize()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
@@ -112,7 +112,7 @@ done init awsommium
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-ControlWindow:drawDestroyInitComponents()
+ControlWindow:drawChangeWindowSize()
ControlWindow:DrawTopLeft()
ControlWindow:ControlWindowFunc(Int32)
UnityEngine._Window:Do()
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.

0 comments on commit a539abf

Please sign in to comment.