Move texture uploading out of a lambda.

[nageru] / nageru / scene.h

diff --git a/nageru/scene.h b/nageru/scene.h
index 8cff06a8d3e53946af18ad4e41aedfe56e5236b0..4388bbe71720b71930d8a078249849c0b2dc645f 100644 (file)
--- a/nageru/scene.h
+++ b/nageru/scene.h
@@ -134,7 +134,7 @@ struct Block {
 
        // Only for AUTO_WHITE_BALANCE_EFFECT. Points to the parent block with is_input = true,
        // so that we know which signal to get the white balance from.
-       const Block *root_input_block = nullptr;
+       const Block *white_balance_controller_block = nullptr;
 };
 
 int Block_display(lua_State* L);
@@ -167,6 +167,7 @@ private:
        movit::Effect *instantiate_effects(const Block *block, size_t chain_idx, Instantiation *instantiation);
        size_t compute_chain_number_for_block(size_t block_idx, const std::bitset<256> &disabled) const;
        static void find_inputs_for_block(lua_State *L, Scene *scene, Block *block, int first_input_idx = 3);
+       static Block *find_block_from_arg(lua_State *L, Scene *scene, int idx);
 
        // Find out which blocks (indexed by position in the “blocks” array),
        // if any, are disabled in a given instantiation. A disabled block is
@@ -201,7 +202,7 @@ public:
        static int add_input(lua_State *L);
        static int add_effect(lua_State *L);
        static int add_optional_effect(lua_State *L);
-       static int add_auto_white_balance(lua_State *L);
+       static int add_white_balance(lua_State *L);
        static int finalize(lua_State *L);
 };