Moving all gl1.x rasterizers to one

.gitignore

@@ -49,7 +49,8 @@ platform/wiiu/*
 *.d
 *.so
 *.os
-
+*.rpx
+*.3dsx
 # QT project files
 *.config
 *.creator

demos/2d/rubegoldberg/.fscache

@@ -0,0 +1,16 @@
+::res://::1705781638
+ball.xml::PackedScene::1705781638::
+box.xml::PackedScene::1705781638::
+domino.xml::PackedScene::1705781638::
+icon.png::ImageTexture::1705781638::
+pendulum.xml::PackedScene::1705781638::
+platform.xml::PackedScene::1705781638::
+rubegoldberg.xml::PackedScene::1705781638::
+seesaw.xml::PackedScene::1705781638::
+::res://art::1705781638
+bowling_ball.png::ImageTexture::1705781638::
+box.png::ImageTexture::1705781638::
+domino.png::ImageTexture::1705781638::
+platform.png::ImageTexture::1705781638::
+seesaw_base.png::ImageTexture::1705781638::
+seesaw_top.png::ImageTexture::1705781638::

demos/3d/balls/.fscache

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+::res://::1708862929
+char_controller.gd::GDScript::1708780813::
+=======
 ::res://::1710360441
 char_controller.gd::GDScript::1710360441::
+>>>>>>> fbdd36df3a8b2e204567fa7fd666453ee94e0c0c
 cube.scn::PackedScene::1705843654::scene_3d<>Models/cube.dae<>466036871213f4c3460df5cc83c6a860<>1682196562
 floor.scn::PackedScene::1705844193::scene_3d<>Models/floor.dae<>b125887aa8250cd928758a60a3a1bfb5<>1682251078
 icon.png::ImageTexture::1705843536::

demos/3d/fixed_materials/.fscache

@@ -0,0 +1,14 @@
+::res://::1705781638
+brick_color.png::ImageTexture::1705781638::
+brick_detail.png::ImageTexture::1705781638::
+brick_detail_emission.png::ImageTexture::1705781638::
+brick_detail_glow.png::ImageTexture::1705781638::
+brick_emission.png::ImageTexture::1705781638::
+brick_normal.png::ImageTexture::1705781638::
+fixed_materials.scn::PackedScene::1705781638::scene_3d<>./boxsphere.dae<>97feba9c1b870d4caf1d354f6adcb5db<>0
+icon.png::ImageTexture::1705781638::
+refmap.png::ImageTexture::1705781638::
+rim.png::ImageTexture::1705781638::
+rocky_specular.png::ImageTexture::1705781638::
+s.xml::Mesh::1705781638::
+tournesol.png::ImageTexture::1705781638::

demos/3d/sat_test/.fscache

@@ -0,0 +1,7 @@
+::res://::1705781638
+box.scn::PackedScene::1705781638::scene_3d<>./shapes.dae<>53bcfe8d39f1cc21dd4552d41b542c80<>1705781638
+capsule.scn::PackedScene::1705781638::scene_3d<>./shapes.dae<>53bcfe8d39f1cc21dd4552d41b542c80<>1705781638
+convex.scn::PackedScene::1705781638::scene_3d<>./shapes.dae<>53bcfe8d39f1cc21dd4552d41b542c80<>1705781638
+sat_test.xml::PackedScene::1705781638::
+shapes.scn::PackedScene::1705781638::scene_3d<>./shapes.dae<>53bcfe8d39f1cc21dd4552d41b542c80<>1705781638
+sphere.scn::PackedScene::1705781638::scene_3d<>./shapes.dae<>53bcfe8d39f1cc21dd4552d41b542c80<>1705781638

demos/3d/simple/.fscache

@@ -0,0 +1,2 @@
+::res://::1708965924
+icon.png::ImageTexture::1708965924::

demos/3d/simple/cube.dae

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.80.75 commit date:2019-07-29, commit time:14:47, hash:f6cb5f54494e</authoring_tool>
+    </contributor>
+    <created>2024-02-26T17:50:03</created>
+    <modified>2024-02-26T17:50:03</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_effects>
+    <effect id="Material-effect">
+      <profile_COMMON>
+        <technique sid="common">
+          <lambert>
+            <emission>
+              <color sid="emission">0 0 0 1</color>
+            </emission>
+            <diffuse>
+              <color sid="diffuse">0.8 0.8 0.8 1</color>
+            </diffuse>
+            <index_of_refraction>
+              <float sid="ior">1.45</float>
+            </index_of_refraction>
+          </lambert>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_images/>
+  <library_materials>
+    <material id="Material-material" name="Material">
+      <instance_effect url="#Material-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Cube-mesh" name="Cube">
+      <mesh>
+        <source id="Cube-mesh-positions">
+          <float_array id="Cube-mesh-positions-array" count="24">1 1 1 1 1 -1 1 -1 1 1 -1 -1 -1 1 1 -1 1 -1 -1 -1 1 -1 -1 -1</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-positions-array" count="8" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cube-mesh-normals">
+          <float_array id="Cube-mesh-normals-array" count="18">0 0 1 0 -1 0 -1 0 0 0 0 -1 1 0 0 0 1 0</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-normals-array" count="6" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Cube-mesh-map-0">
+          <float_array id="Cube-mesh-map-0-array" count="72">0.625 0 0.375 0.25 0.375 0 0.625 0.25 0.375 0.5 0.375 0.25 0.625 0.5 0.375 0.75 0.375 0.5 0.625 0.75 0.375 1 0.375 0.75 0.375 0.5 0.125 0.75 0.125 0.5 0.875 0.5 0.625 0.75 0.625 0.5 0.625 0 0.625 0.25 0.375 0.25 0.625 0.25 0.625 0.5 0.375 0.5 0.625 0.5 0.625 0.75 0.375 0.75 0.625 0.75 0.625 1 0.375 1 0.375 0.5 0.375 0.75 0.125 0.75 0.875 0.5 0.875 0.75 0.625 0.75</float_array>
+          <technique_common>
+            <accessor source="#Cube-mesh-map-0-array" count="36" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Cube-mesh-vertices">
+          <input semantic="POSITION" source="#Cube-mesh-positions"/>
+        </vertices>
+        <triangles material="Material-material" count="12">
+          <input semantic="VERTEX" source="#Cube-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Cube-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Cube-mesh-map-0" offset="2" set="0"/>
+          <p>4 0 0 2 0 1 0 0 2 2 1 3 7 1 4 3 1 5 6 2 6 5 2 7 7 2 8 1 3 9 7 3 10 5 3 11 0 4 12 3 4 13 1 4 14 4 5 15 1 5 16 5 5 17 4 0 18 6 0 19 2 0 20 2 1 21 6 1 22 7 1 23 6 2 24 4 2 25 5 2 26 1 3 27 3 3 28 7 3 29 0 4 30 2 4 31 3 4 32 4 5 33 0 5 34 1 5 35</p>
+        </triangles>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Cube" name="Cube" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Cube-mesh" name="Cube">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="Material-material" target="#Material-material">
+                <bind_vertex_input semantic="UVMap" input_semantic="TEXCOORD" input_set="0"/>
+              </instance_material>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>

demos/3d/simple/engine.cfg

@@ -0,0 +1,5 @@
+[application]
+
+name="simple"
+main_scene="res://main.scn"
+icon="icon.png"

demos/3d/simple/icon.png.flags

@@ -0,0 +1 @@
+gen_mipmaps=true

demos/misc/simple_audio/.fscache

@@ -0,0 +1,4 @@
+::res://::1708967223
+icon.png::ImageTexture::1708966717::
+k_jose_-_its_time.ogg::AudioStreamOGGVorbis::1708967006::
+main.scn::PackedScene::1708967223::

demos/misc/simple_audio/engine.cfg

@@ -0,0 +1,5 @@
+[application]
+
+name="simple_audio"
+main_scene="res://main.scn"
+icon="icon.png"

demos/misc/simple_audio/icon.png.flags

@@ -0,0 +1 @@
+gen_mipmaps=true

drivers/SCsub

@@ -8,11 +8,13 @@ Export('env')
 SConscript('unix/SCsub');
 SConscript('alsa/SCsub');
 SConscript('windows/SCsub');
-if env["platform"] in ("x11", "vita"):
+
+if env["platform"] in ("x11", "vita", "javascript"):
 	SConscript('gles2/SCsub');
 if env["platform"] in ("x11soft", "windows"):
 	SConscript('gl11/SCsub');
-elif env["platform"] != "vita":
+else:
+
 	SConscript('gles1/SCsub');
 SConscript('gl_context/SCsub');
 SConscript('openssl/SCsub');