[email protected] 8 years ago
parent
commit
ce7f44fd8b

+ 23 - 2
oxygine/src/oxygine/STDMaterial.cpp

@@ -35,15 +35,36 @@ namespace oxygine
 
     void STDMaterial::render(ClipRectActor* actor, const RenderState& parentRS)
     {
+        STDRenderer* renderer = STDRenderer::getCurrent();
+        IVideoDriver* driver = renderer->getDriver();
+
         RenderState rs = parentRS;
+        if (actor->getName() == "aaa")
+        {
+            renderer->flush();
+
+            Rect scissorRect(0, 0, 0, 0);
+            bool scissorEnabled = driver->getScissorRect(scissorRect);
+
+            Rect r(0, 0, 100, 100);
+            driver->setScissorRect(&r);
+
+            //actor->Actor::render(rs);
+            //renderer->flush();
+
+            driver->setScissorRect(0);
+
+            return;
+        }
+        
 
         const RectF* parentClippedRect = parentRS.clip;
         RectF clippedRect = *parentClippedRect;
         rs.clip = &clippedRect;
 
         Rect scissorRect(0, 0, 0, 0);
-        STDRenderer* renderer = STDRenderer::getCurrent();
-        IVideoDriver* driver = renderer->getDriver();
+        
+        
         bool scissorEnabled = driver->getScissorRect(scissorRect);
 
         bool vis = true;

+ 2 - 3
oxygine/src/oxygine/res/Resources.cpp

@@ -199,11 +199,10 @@ namespace oxygine
         char destTail[255];
         path::split(xmlFile.c_str(), destHead, destTail);
 
-        std::string prebuilt_folder = opt._prebuilFolder + "/" + destTail + ".ox/";
+        std::string prebuilt_folder = path::normalize(opt._prebuilFolder + "/" + destTail + ".ox/");
+
         if (prebuilt_folder[0] == '/')
-        {
             prebuilt_folder.erase(prebuilt_folder.begin());
-        }
 
         file::buffer fb_meta;
         pugi::xml_document doc_meta;

+ 3 - 1
readme/emscripten.txt

@@ -21,6 +21,7 @@ How to build. Steps:
   JDK 
   	example: "c:\Program Files (x86)\Java\jdk1.6.0_26\bin\"
 
+- *emsc bug and workaround http://oxygine.org/forum/viewtopic.php?f=6&t=3295
 
 - Select any example from examples folder. For example "Demo"
 - Go to folder oxygine-framework/examples/Demo/proj.cmake
@@ -35,4 +36,5 @@ How to build. Steps:
   oxygine-framework\tools\gen_template.py
 
 example:
-	python gen_template.py MyProject -t cmake -d path/to/MyProject/
+	python gen_template.py MyProject -t cmake -d path/to/MyProject/
+