Permalink
Browse files

1 milestone

  • Loading branch information...
1 parent a539abf commit ce73c7f90ba859a6f6a39951121858944ccc6384 @schlunsen committed Nov 11, 2010
Showing with 58 additions and 64 deletions.
  1. +9 −6 Assets/AwesomiumWrapper/AwesomiumMeshRender.cs
  2. BIN Assets/Plugins/UnityAwesomium.dll
  3. BIN Library/EditorUserBuildSettings.asset
  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/00/00000000000000002000000000000000
  12. BIN Library/cache/00/00000000000000003000000000000000
  13. BIN Library/cache/00/00000000000000004000000000000000
  14. BIN Library/cache/00/00000000000000005000000000000000
  15. BIN Library/cache/00/00000000000000006000000000000000
  16. BIN Library/cache/00/00000000000000007000000000000000
  17. BIN Library/cache/00/00000000000000009000000000000000
  18. BIN Library/cache/00/0000000000000000a000000000000000
  19. BIN Library/cache/00/0000000000000000b000000000000000
  20. BIN Library/cache/00/0000000000000000c000000000000000
  21. BIN Library/cache/0a/0ab79d7f243824f5d9826bd83522c8df
  22. BIN Library/cache/0b/0b167d00b3108411a8a963cba5ddde1b
  23. BIN Library/cache/19/195c271a9118d224c8562ae67cf47a66
  24. BIN Library/cache/1b/1b3805a7dbdb9a0478f52b05b691abb2
  25. BIN Library/cache/1d/1d5ac211a643e447ca78c2d794a16381
  26. BIN Library/cache/23/2372dd1814cb4ed47a91f8174877623e
  27. BIN Library/cache/2d/2de383558d01e9049baa7e9a9f166653
  28. BIN Library/cache/32/32ef381921b3f7f479831b042c113762
  29. BIN Library/cache/35/352e5f82d7105ad408904c5f552b5fe7
  30. BIN Library/cache/39/397c6a4ca7b394e478c785a93c2c8909
  31. BIN Library/cache/60/60bca8f58a0b8478e946e6e86658cb29
  32. BIN Library/cache/66/66ebe4da1ef67e64e8aeccb820e409d6
  33. BIN Library/cache/68/68ec2fe99d1108b9d0006a298d76c639
  34. BIN Library/cache/74/743d8c5197cf888429d53c1bed49c255
  35. BIN Library/cache/7d/7d34d948539c9bf4b9a557ebc771dd9a
  36. BIN Library/cache/8a/8a98ef45bc7df804d95fd945abd2c943
  37. BIN Library/cache/96/96aaf6eedb57489419cd1c026e6af47a
  38. BIN Library/cache/b1/b160ccd622e06c9439c8c8afa28d28a0
  39. BIN Library/cache/c4/c4e702f769357c54698524de673f6313
  40. BIN Library/cache/da/da93ddd6928094e24bb1f3f665f143d3
  41. BIN Library/cache/fb/fbf51a8f488eb954ab1b7f2566dfd56f
  42. BIN Library/guidmapper
  43. BIN Library/metadata/00/00000000000000002000000000000000
  44. BIN Library/metadata/00/00000000000000003000000000000000
  45. BIN Library/metadata/00/00000000000000004000000000000000
  46. BIN Library/metadata/00/00000000000000005000000000000000
  47. BIN Library/metadata/00/00000000000000006000000000000000
  48. BIN Library/metadata/00/00000000000000007000000000000000
  49. BIN Library/metadata/00/00000000000000009000000000000000
  50. BIN Library/metadata/00/0000000000000000a000000000000000
  51. BIN Library/metadata/00/0000000000000000b000000000000000
  52. BIN Library/metadata/00/0000000000000000c000000000000000
  53. BIN Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
  54. BIN Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
  55. BIN Library/metadata/0c/0c404151eae2f404e94a102dbb9a1e8d
  56. BIN Library/metadata/19/195c271a9118d224c8562ae67cf47a66
  57. BIN Library/metadata/1b/1b3805a7dbdb9a0478f52b05b691abb2
  58. BIN Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
  59. BIN Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
  60. BIN Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
  61. BIN Library/metadata/2d/2de383558d01e9049baa7e9a9f166653
  62. BIN Library/metadata/32/32ef381921b3f7f479831b042c113762
  63. BIN Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
  64. BIN Library/metadata/39/397c6a4ca7b394e478c785a93c2c8909
  65. BIN Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
  66. BIN Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
  67. BIN Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
  68. BIN Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
  69. BIN Library/metadata/74/743d8c5197cf888429d53c1bed49c255
  70. BIN Library/metadata/7d/7d34d948539c9bf4b9a557ebc771dd9a
  71. BIN Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
  72. BIN Library/metadata/96/96aaf6eedb57489419cd1c026e6af47a
  73. BIN Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
  74. BIN Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
  75. BIN Library/metadata/b1/b160ccd622e06c9439c8c8afa28d28a0
  76. BIN Library/metadata/c4/c4e702f769357c54698524de673f6313
  77. BIN Library/metadata/c6/c64ceccb926e4ff4b831dd2a1e88ad8c
  78. BIN Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
  79. BIN Library/metadata/cc/cc9a9e51cb229ff4fa57502d98584f64
  80. BIN Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
  81. BIN Library/previews/9d/9d4133d5d30b644bd87802a347eaccbe
  82. BIN UnityAwesomium.suo
  83. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.dll
  84. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.exp
  85. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.lib
  86. BIN UnityAwesomiumSource/Unity/Release/UnityAwesomium.pdb
  87. +7 −6 UnityAwesomiumSource/Unity/Unity/AwesomiumPlugin.cpp
  88. BIN UnityAwesomiumSource/Unity/Unity/Release/AwesomiumPlugin.obj
  89. BIN UnityAwesomiumSource/Unity/Unity/Release/BuildLog.htm
  90. +1 −1 UnityAwesomiumSource/Unity/Unity/Release/mt.dep
  91. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.idb
  92. BIN UnityAwesomiumSource/Unity/Unity/Release/vc90.pdb
  93. BIN UnityAwesomiumSource/Unity/UnityAwesomium.ncb
  94. BIN UnityAwesomiumSource/Unity/UnityAwesomium.suo
  95. +8 −8 build/awesomium.log
  96. BIN build/test_Data/Managed/Assembly-CSharp-firstpass.dll
  97. BIN build/test_Data/Managed/Assembly-CSharp.dll
  98. BIN build/test_Data/Managed/Assembly-UnityScript-firstpass.dll
  99. BIN build/test_Data/Plugins/UnityAwesomium.dll
  100. +7 −43 build/test_Data/output_log.txt
  101. +26 −0 debug.log
@@ -143,12 +143,15 @@ public void Loadfile(string filePath)
public void DestroyAwesomiumWindow()
{
try
- {
-
- AwesomiumWrapper.DestroyAwesomiumWebView(m_TextureID);
- m_pixelsHandler.Free();
- GetComponent<BrowserGUIEvents>().interactive = false;
- isAwesomiumInit = false;
+ {
+ if (m_TextureID != 0)
+ {
+ AwesomiumWrapper.DestroyAwesomiumWebView(m_TextureID);
+ m_pixelsHandler.Free();
+ GetComponent<BrowserGUIEvents>().interactive = false;
+ isAwesomiumInit = false;
+ m_TextureID = 0;
+ }
}
catch (System.Exception e)
{
Binary file not shown.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
Binary file not shown.
Binary file not shown.
@@ -40,17 +40,18 @@ class AwesomiumWindow : public Awesomium::WebViewListener
setPaintFunctions(setPixelFunc,applyTextureFunc);
m_webView = webCore->createWebView(m_width,m_height);
m_webView->setListener(this);
- //m_webView->loadURL("http:://google.dk");//url);
+ m_webView->loadURL("http://google.dk");//url);
}
AwesomiumWindow::~AwesomiumWindow(){
//free(pixelBuffer);
m_webView->destroy();
+ isEnabled = false;
}
void update(){
-
+
if (isEnabled && m_webView->isDirty()){
// Create char pixel buffer
unsigned char* buffer = new unsigned char[m_width * m_height * 4];
@@ -59,6 +60,8 @@ class AwesomiumWindow : public Awesomium::WebViewListener
// Convert and copy rendered Awesomium pixel buffer to our float buffer
this->convertBuffer(buffer);
+
+ // set Unity render flag. Temporarely fix
m_isDirty = true;
// Do repaint in unity
@@ -100,8 +103,7 @@ for(int y = 0; y < m_height; ++y)
{
//copy a pixel from a row y from the top of inData to a row y from the bottom of outData
//x is the xth byte of the row, not the xth pixel.
- pixelBuffer[y * m_width * 4 + x] = charBuf[(m_height - 1 - y) * m_width * 4 + x] / 255.0f;
-
+ pixelBuffer[y * m_width * 4 + x] = charBuf[(m_height - 1 - y) * m_width * 4 + x] / 255.0f;
}
}
}
@@ -160,8 +162,7 @@ AwesomiumWindow *getWindow(int id)
{
WindowMap::const_iterator it = awesomiumWindows.find(id);
if(it == awesomiumWindows.end())
- {
- //myfile << "Warning: no awesomium window found with ID " << id << "!";
+ {
return 0;
}
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
-Manifest resource last updated at 16:46:26,48 on 11-11-2010
+Manifest resource last updated at 17:28:17,68 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/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:
+[1111/172832:INFO:WebCore.cpp(74)] Creating the core thread.
+[1111/172832:INFO:WebCore.cpp(84)] Creating the WebCore.
+[1111/172832:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
+[1111/172832:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
+[1111/172832:INFO:WebView.cpp(68)] A new WebView has been created.
+[1111/172832:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
+[1111/172832:INFO:WebViewProxy.cpp(150)] WebViewProxy[1] has been created.
+[1111/172832: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.
@@ -1,18 +1,18 @@
-Mono path[0] = 'C:/Users/kamante/Desktop/unityawesomiumstable/UnityAwesomium/build/test_Data/Managed'
-Mono path[1] = 'C:/Users/kamante/Desktop/unityawesomiumstable/UnityAwesomium/build/test_Data/Mono'
+Mono path[0] = 'C:/Users/kamante/Desktop/uatest/UnityAwesomium/build/test_Data/Managed'
+Mono path[1] = 'C:/Users/kamante/Desktop/uatest/UnityAwesomium/build/test_Data/Mono'
Direct3D:
Version: Direct3D 9.0c [aticfx32.dll 8.17.10.1041]
Renderer: ATI Radeon HD 4290
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.
-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)
+desktop: 1920x1080 59Hz; virtual: 1920x1080 at 0,0
+Non platform assembly: data-02FEF2E8 (this message is harmless)
+Non platform assembly: data-03051B58 (this message is harmless)
+Non platform assembly: data-030543C8 (this message is harmless)
+Non platform assembly: data-03069038 (this message is harmless)
The referenced script on this Behaviour is missing!
(Filename: ..\..\Runtime\Mono\MonoBehaviour.cpp Line: 1695)
@@ -84,42 +84,6 @@ UnityEngine.GUI:BeginWindows(Event, Int32, IDList, Int32)
(Filename: ..\..\Runtime\Export\Generated\BaseClass.cpp Line: 2528)
-init awsommium
-UnityEngine.Debug:Internal_Log(Int32, String, Object)
-UnityEngine.Debug:Log(Object)
-AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-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 : -10074
-UnityEngine.Debug:Internal_Log(Int32, String, Object)
-UnityEngine.Debug:Log(Object)
-AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-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)
-
-done init awsommium
-UnityEngine.Debug:Internal_Log(Int32, String, Object)
-UnityEngine.Debug:Log(Object)
-AwesomiumMeshRender:InitAwesomium(Int32, Int32)
-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)
-
quit
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
View
@@ -0,0 +1,26 @@
+[1111/172406:INFO:WebCore.cpp(74)] Creating the core thread.
+[1111/172406:INFO:WebCore.cpp(84)] Creating the WebCore.
+[1111/172406:INFO:RequestContext.cpp(68)] An invalid or empty cookie path was specified, cookies will be lost on program exit.
+[1111/172406:INFO:RequestContext.cpp(111)] An invalid or empty cache path was specified, cache will be lost on program exit.
+[1111/172406:INFO:WebView.cpp(68)] A new WebView has been created.
+[1111/172406:INFO:WebCoreProxy.cpp(202)] The WebCore is now online.
+[1111/172406:INFO:WebViewProxy.cpp(150)] WebViewProxy[8] has been created.
+[1111/172406:INFO:proxy_service.cc(619)] New proxy configuration was loaded:
+{
+ auto_detect: 0
+ pac_url:
+ proxy_rules:
+ {
+ type: TYPE_NO_RULES
+ single_proxy:
+ proxy_for_http:
+ proxy_for_https:
+ proxy_for_ftp:
+ }
+ proxy_bypass_local_names: 0
+ proxy_bypass_list:
+ id: 1
+}
+[1111/172406:INFO:WebViewProxy.cpp(172)] WebViewProxy[8]::asyncShutdown, refCount is 4
+[1111/172406:INFO:WebView.cpp(83)] A WebView has been destroyed.
+[1111/172406:INFO:WebViewProxy.cpp(132)] WebViewProxy[8] has been destroyed.

0 comments on commit ce73c7f

Please sign in to comment.