Some changes

CMakeSettings.json

@@ -5,7 +5,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "configurationType": "Debug",
-      "generator": "Ninja Multi-Config",
+      "generator": "Ninja",
       "intelliSenseMode": "windows-msvc-x64",
       "inheritEnvironments": [ "msvc_x64" ],
       "cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=\"\" -DCMAKE_PLATFORM=x64",

res/shaders/TextPass.slang

@@ -1,23 +1,5 @@
 import Common;
 
-struct GlyphInstanceData
-{
-    float x;
-    float y;
-    float z;
-    float width;
-    float height;
-    uint glyphIndex;
-};
-
-struct TextData
-{
-    StructuredBuffer<GlyphInstanceData> glyphs;
-    SamplerState glyphSampler;
-    Texture2D<float> glyphTextures[];
-};
-ParameterBlock<TextData> pText;
-
 struct VertexInput
 {
     uint vertexId : SV_VertexID;
@@ -31,6 +13,24 @@ struct VertexOutput
     uint glyphIndex : GLYPHINDEX;
 };
 
+struct GlyphInstanceData
+{
+    float x;
+    float y;
+    float z;
+    float width;
+    float height;
+    uint glyphIndex;
+};
+struct TextData
+{
+    StructuredBuffer<GlyphInstanceData> glyphs;
+    SamplerState glyphSampler;
+    Texture2D<float> glyphTextures[];
+};
+ParameterBlock<TextData> pText;
+
+
 [shader("vertex")]
 VertexOutput vertexMain(VertexInput input)
 {

res/shaders/lib/LightEnv.slang

@@ -70,6 +70,10 @@ struct LightEnv
 layout(set=3)
 ParameterBlock<LightEnv> pLightEnv;
 
+[Differentiable]
+float polynomial(float a, float b, float c, float x) {
+    return a * x * x + b * x + c;
+}
 
 interface IBRDF
 {

src/Editor/main.cpp

@@ -50,6 +50,8 @@ int main() {
         AssetImporter::importEnvironmentMap(EnvironmentImportArgs{
             .filePath = sourcePath / "import" / "textures" / "newport_loft.hdr",
         });
+        AssetImporter::importTexture(TextureImportArgs{.filePath = sourcePath / "import" / "texture" / "Dirt.png", .importPath = ""});
+        
         
         getThreadPool().waitIdle();
         vd->commitMeshes();

src/Engine/Graphics/RenderPass/BasePass.cpp

@@ -157,8 +157,7 @@ void BasePass::render() {
         vertexData->getInstanceDataSet()->updateBuffer(VertexData::CULLINGDATA_NAME, 0, cullingBuffer);
         vertexData->getInstanceDataSet()->writeChanges();
         permutation.setVertexData(vertexData->getTypeName());
-        const auto& materials = vertexData->getMaterialData();
-        for (const auto& materialData : materials) {
+        for (const auto& materialData : vertexData->getMaterialData()) {
             // material not used for any active meshes, skip
             if (materialData.instances.size() == 0)
                 continue;

src/Engine/Graphics/slang-compile.cpp

@@ -139,11 +139,9 @@ void Seele::beginCompilation(const ShaderCompilationInfo& info, SlangCompileTarg
 
     slang::ProgramLayout* signature = specializedComponent->getLayout(0, diagnostics.writeRef());
     CHECK_DIAGNOSTICS();
-    //std::cout << info.name << std::endl;
     for (uint32 i = 0; i < signature->getParameterCount(); ++i) {
         auto param = signature->getParameterByIndex(i);
         layout->addMapping(param->getName(), param->getBindingIndex());
-        //std::cout << param->getName() << ": " << param->getBindingIndex() << std::endl;
     }
 
     // workaround

src/Engine/Material/ShaderExpression.h

@@ -4,7 +4,6 @@
 #include "Math/Math.h"
 #include "MinimalEngine.h"
 
-
 namespace Seele {
 enum class ExpressionType {
     UNKNOWN,
@@ -184,6 +183,9 @@ struct SwizzleExpression : public ShaderExpression {
     StaticArray<int32, 4> comp = {-1, -1, -1, -1};
     SwizzleExpression() {}
     SwizzleExpression(StaticArray<int32, 4> comp) : comp(std::move(comp)) {}
+    SwizzleExpression(std::string key, std::string target, StaticArray<int32, 4> comp) : ShaderExpression(key) {
+        inputs["target"].source = target;
+    }
     virtual ~SwizzleExpression() {}
     virtual uint64 getIdentifier() const override { return IDENTIFIER; }
     virtual std::string evaluate(Map<std::string, std::string>& varState) const override;
@@ -194,6 +196,11 @@ DEFINE_REF(SwizzleExpression)
 struct SampleExpression : public ShaderExpression {
     static constexpr uint64 IDENTIFIER = 0x16;
     SampleExpression() {}
+    SampleExpression(std::string key, std::string texture, std::string sampler, std::string texCoords) : ShaderExpression(key) {
+        inputs["texture"].source = texture;
+        inputs["sampler"].source = sampler;
+        inputs["texCoords"].source = texCoords;
+    }
     virtual ~SampleExpression() {}
     virtual uint64 getIdentifier() const override { return IDENTIFIER; }
     virtual std::string evaluate(Map<std::string, std::string>& varState) const override;
@@ -205,8 +212,6 @@ DEFINE_REF(SampleExpression)
 struct MaterialNode {
     std::string profile;
     Map<std::string, std::string> variables;
-    MaterialNode() {}
-    ~MaterialNode() {}
     void save(ArchiveBuffer& buffer) const;
     void load(ArchiveBuffer& buffer);
 };

src/Engine/System/MeshUpdater.cpp

@@ -9,7 +9,8 @@ MeshUpdater::MeshUpdater(PScene scene) : ComponentSystem<Component::Transform, C
 
 MeshUpdater::~MeshUpdater() {}
 
-void MeshUpdater::update(entt::entity, Component::Transform& transform, Component::Mesh& comp) {
+void MeshUpdater::update(entt::entity id, Component::Transform& transform, Component::Mesh& comp) {
+    scene->accessComponent<Component::Camera>(id);
     if (comp.meshletOffsets.empty()) {
         for (uint32 i = 0; i < comp.asset->meshes.size(); ++i) {
             comp.meshletOffsets.add(comp.asset->meshes[i]->vertexData->addCullingMapping(comp.asset->meshes[i]->id));

test.py

@@ -16,3 +16,11 @@ print(positions)
 print(indices)
     
 
+# Create a tensor with attached grads from a numpy array
+# Note: We pass zero=True to initialize the grads to zero on allocation
+x = spy.Tensor.numpy(device, np.array([1, 2, 3, 4], dtype=np.float32)).with_grads(zero=True)
+
+# Evaluate the polynomial and ask for a tensor back
+# Expecting result = 2x^2 + 8x - 1
+result: spy.Tensor = module.polynomial(a=2, b=8, c=-1, x=x, _result='tensor')
+print(result.to_numpy())