Skip to content
This repository has been archived by the owner on Jul 20, 2019. It is now read-only.

Commit

Permalink
1 milestone
Browse files Browse the repository at this point in the history
  • Loading branch information
schlunsen committed Nov 11, 2010
1 parent a539abf commit ce73c7f
Show file tree
Hide file tree
Showing 101 changed files with 58 additions and 64 deletions.
15 changes: 9 additions & 6 deletions Assets/AwesomiumWrapper/AwesomiumMeshRender.cs
Expand Up @@ -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)
{
Expand Down
Binary file modified Assets/Plugins/UnityAwesomium.dll
Binary file not shown.
Binary file modified Library/EditorUserBuildSettings.asset
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
Binary file not shown.
Binary file modified Library/assetDatabase3
Binary file not shown.
Binary file modified Library/cache/00/00000000000000002000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000003000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000004000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000005000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000006000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000007000000000000000
Binary file not shown.
Binary file modified Library/cache/00/00000000000000009000000000000000
Binary file not shown.
Binary file modified Library/cache/00/0000000000000000a000000000000000
Binary file not shown.
Binary file modified Library/cache/00/0000000000000000b000000000000000
Binary file not shown.
Binary file modified Library/cache/00/0000000000000000c000000000000000
Binary file not shown.
Binary file modified Library/cache/0a/0ab79d7f243824f5d9826bd83522c8df
Binary file not shown.
Binary file modified Library/cache/0b/0b167d00b3108411a8a963cba5ddde1b
Binary file not shown.
Binary file modified Library/cache/19/195c271a9118d224c8562ae67cf47a66
Binary file not shown.
Binary file modified Library/cache/1b/1b3805a7dbdb9a0478f52b05b691abb2
Binary file not shown.
Binary file modified Library/cache/1d/1d5ac211a643e447ca78c2d794a16381
Binary file not shown.
Binary file modified Library/cache/23/2372dd1814cb4ed47a91f8174877623e
Binary file not shown.
Binary file removed Library/cache/2d/2de383558d01e9049baa7e9a9f166653
Binary file not shown.
Binary file modified Library/cache/32/32ef381921b3f7f479831b042c113762
Binary file not shown.
Binary file modified Library/cache/35/352e5f82d7105ad408904c5f552b5fe7
Binary file not shown.
Binary file modified Library/cache/39/397c6a4ca7b394e478c785a93c2c8909
Binary file not shown.
Binary file modified Library/cache/60/60bca8f58a0b8478e946e6e86658cb29
Binary file not shown.
Binary file modified Library/cache/66/66ebe4da1ef67e64e8aeccb820e409d6
Binary file not shown.
Binary file modified Library/cache/68/68ec2fe99d1108b9d0006a298d76c639
Binary file not shown.
Binary file modified Library/cache/74/743d8c5197cf888429d53c1bed49c255
Binary file not shown.
Binary file modified Library/cache/7d/7d34d948539c9bf4b9a557ebc771dd9a
Binary file not shown.
Binary file modified Library/cache/8a/8a98ef45bc7df804d95fd945abd2c943
Binary file not shown.
Binary file modified Library/cache/96/96aaf6eedb57489419cd1c026e6af47a
Binary file not shown.
Binary file modified Library/cache/b1/b160ccd622e06c9439c8c8afa28d28a0
Binary file not shown.
Binary file modified Library/cache/c4/c4e702f769357c54698524de673f6313
Binary file not shown.
Binary file modified Library/cache/da/da93ddd6928094e24bb1f3f665f143d3
Binary file not shown.
Binary file modified Library/cache/fb/fbf51a8f488eb954ab1b7f2566dfd56f
Binary file not shown.
Binary file modified Library/guidmapper
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000002000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000003000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000004000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000005000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000006000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000007000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/00000000000000009000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/0000000000000000a000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/0000000000000000b000000000000000
Binary file not shown.
Binary file modified Library/metadata/00/0000000000000000c000000000000000
Binary file not shown.
Binary file modified Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
Binary file not shown.
Binary file modified Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
Binary file not shown.
Binary file modified Library/metadata/0c/0c404151eae2f404e94a102dbb9a1e8d
Binary file not shown.
Binary file modified Library/metadata/19/195c271a9118d224c8562ae67cf47a66
Binary file not shown.
Binary file modified Library/metadata/1b/1b3805a7dbdb9a0478f52b05b691abb2
Binary file not shown.
Binary file modified Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
Binary file not shown.
Binary file modified Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
Binary file not shown.
Binary file modified Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
Binary file not shown.
Binary file removed Library/metadata/2d/2de383558d01e9049baa7e9a9f166653
Binary file not shown.
Binary file modified Library/metadata/32/32ef381921b3f7f479831b042c113762
Binary file not shown.
Binary file modified Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
Binary file not shown.
Binary file modified Library/metadata/39/397c6a4ca7b394e478c785a93c2c8909
Binary file not shown.
Binary file modified Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
Binary file not shown.
Binary file modified Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
Binary file not shown.
Binary file modified Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
Binary file not shown.
Binary file modified Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
Binary file not shown.
Binary file modified Library/metadata/74/743d8c5197cf888429d53c1bed49c255
Binary file not shown.
Binary file modified Library/metadata/7d/7d34d948539c9bf4b9a557ebc771dd9a
Binary file not shown.
Binary file modified Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
Binary file not shown.
Binary file modified Library/metadata/96/96aaf6eedb57489419cd1c026e6af47a
Binary file not shown.
Binary file modified Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
Binary file not shown.
Binary file modified Library/metadata/a2/a2126534b3a11b34e977105bd9e3cc03
Binary file not shown.
Binary file modified Library/metadata/b1/b160ccd622e06c9439c8c8afa28d28a0
Binary file not shown.
Binary file modified Library/metadata/c4/c4e702f769357c54698524de673f6313
Binary file not shown.
Binary file modified Library/metadata/c6/c64ceccb926e4ff4b831dd2a1e88ad8c
Binary file not shown.
Binary file modified Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
Binary file not shown.
Binary file modified Library/metadata/cc/cc9a9e51cb229ff4fa57502d98584f64
Binary file not shown.
Binary file modified Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
Binary file not shown.
Binary file modified Library/previews/9d/9d4133d5d30b644bd87802a347eaccbe
Binary file not shown.
Binary file modified UnityAwesomium.suo
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Release/UnityAwesomium.dll
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Release/UnityAwesomium.exp
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Release/UnityAwesomium.lib
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Release/UnityAwesomium.pdb
Binary file not shown.
13 changes: 7 additions & 6 deletions UnityAwesomiumSource/Unity/Unity/AwesomiumPlugin.cpp
Expand Up @@ -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];
Expand All @@ -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
Expand Down Expand Up @@ -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;
}
}
}
Expand Down Expand Up @@ -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;
}

Expand Down
Binary file modified UnityAwesomiumSource/Unity/Unity/Release/AwesomiumPlugin.obj
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Unity/Release/BuildLog.htm
Binary file not shown.
2 changes: 1 addition & 1 deletion UnityAwesomiumSource/Unity/Unity/Release/mt.dep
@@ -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 modified UnityAwesomiumSource/Unity/Unity/Release/vc90.idb
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/Unity/Release/vc90.pdb
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/UnityAwesomium.ncb
Binary file not shown.
Binary file modified UnityAwesomiumSource/Unity/UnityAwesomium.suo
Binary file not shown.
16 changes: 8 additions & 8 deletions build/awesomium.log
@@ -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:
Expand Down
Binary file modified build/test_Data/Managed/Assembly-CSharp-firstpass.dll
Binary file not shown.
Binary file modified build/test_Data/Managed/Assembly-CSharp.dll
Binary file not shown.
Binary file modified build/test_Data/Managed/Assembly-UnityScript-firstpass.dll
Binary file not shown.
Binary file modified build/test_Data/Plugins/UnityAwesomium.dll
Binary file not shown.
50 changes: 7 additions & 43 deletions build/test_Data/output_log.txt
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down
26 changes: 26 additions & 0 deletions debug.log
@@ -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.